Skip to contentSkip to conversation

cosmetic netfilter patch

PATCH Applied Harald Welte 2 participants 2 messages Aug 24, 2003

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cosmetic netfilter patch

Hi Dave!

The following patch (against 2.6.0-test4) is purely cosmetic. It
- moves all MODULE_{AUTHOR,DESCRIPTION,LICENSE} statements to the same location
- adds some missing MODULE_LICENSE("GPL") tags
- adds MODULE_DESCRIPTION and AUTHOR to all modules

[yes, as any cosmetic patches, this could make other people's patches
break... that's why the patch is 2.6. only]

Please apply, thanks.

net/ipv4/netfilter/arp_tables.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/arp_tables.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/arp_tables.c
@@ -25,6 +25,10 @@
 
 #include <linux/netfilter_arp/arp_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("David S. Miller <[email protected]>");
+MODULE_DESCRIPTION("arptables core");
+
 /*#define DEBUG_ARP_TABLES*/
 /*#define DEBUG_ARP_TABLES_USER*/
 
@@ -1324,4 +1328,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/arpt_mangle.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/arpt_mangle.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/arpt_mangle.c
@@ -3,6 +3,10 @@
 #include <linux/netfilter_arp/arpt_mangle.h>
 #include <net/sock.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("David S. Miller <[email protected]>");
+MODULE_DESCRIPTION("arptables mangle table");
+
 static unsigned int
 target(struct sk_buff **pskb, unsigned int hooknum, const struct net_device *in,
    const struct net_device *out, const void *targinfo, void *userinfo)
@@ -98,4 +102,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/arptable_filter.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/arptable_filter.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/arptable_filter.c
@@ -8,6 +8,10 @@
 #include <linux/module.h>
 #include <linux/netfilter_arp/arp_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("David S. Miller <[email protected]>");
+MODULE_DESCRIPTION("arptables filter table");
+
 #define FILTER_VALID_HOOKS ((1 << NF_ARP_IN) | (1 << NF_ARP_OUT) | \
 			   (1 << NF_ARP_FORWARD))
 
@@ -209,4 +213,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ip_conntrack_ftp.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ip_conntrack_ftp.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ip_conntrack_ftp.c
@@ -11,6 +11,10 @@
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Rusty Russell <[email protected]>");
+MODULE_DESCRIPTION("ftp connection tracking helper");
+
 /* This is slow, but it's simple. --RR */
 static char ftp_buffer[65536];
 
@@ -439,6 +443,5 @@
 PROVIDES_CONNTRACK(ftp);
 EXPORT_SYMBOL(ip_ftp_lock);
 
-MODULE_LICENSE("GPL");
 module_init(init);
 module_exit(fini);
net/ipv4/netfilter/ip_conntrack_irc.c +2 -2
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ip_conntrack_irc.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ip_conntrack_irc.c
@@ -41,8 +41,8 @@
 /* This is slow, but it's simple. --RR */
 static char irc_buffer[65536];
 
-MODULE_AUTHOR("Harald Welte <[email protected]>");
-MODULE_DESCRIPTION("IRC (DCC) connection tracking module");
+MODULE_AUTHOR("Harald Welte <[email protected]>");
+MODULE_DESCRIPTION("IRC (DCC) connection tracking helper");
 MODULE_LICENSE("GPL");
 #ifdef MODULE_PARM
 MODULE_PARM(ports, "1-" __MODULE_STRING(MAX_PORTS) "i");
net/ipv4/netfilter/ip_conntrack_tftp.c +1 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ip_conntrack_tftp.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ip_conntrack_tftp.c
@@ -17,7 +17,7 @@
 #include <linux/netfilter_ipv4/ip_conntrack_tftp.h>
 
 MODULE_AUTHOR("Magnus Boden <[email protected]>");
-MODULE_DESCRIPTION("Netfilter connection tracking module for tftp");
+MODULE_DESCRIPTION("tftp connection tracking helper");
 MODULE_LICENSE("GPL");
 
 #define MAX_PORTS 8
net/ipv4/netfilter/ip_nat_amanda.c +1 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ip_nat_amanda.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ip_nat_amanda.c
@@ -35,7 +35,7 @@
 #endif
 
 MODULE_AUTHOR("Brian J. Murrell <[email protected]>");
-MODULE_DESCRIPTION("Amanda network address translation module");
+MODULE_DESCRIPTION("Amanda NAT helper");
 MODULE_LICENSE("GPL");
 
 /* protects amanda part of conntracks */
net/ipv4/netfilter/ip_nat_ftp.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ip_nat_ftp.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ip_nat_ftp.c
@@ -10,6 +10,10 @@
 #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Rusty Russell <[email protected]>");
+MODULE_DESCRIPTION("ftp NAT helper");
+
 #if 0
 #define DEBUGP printk
 #else
@@ -342,4 +346,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ip_nat_irc.c +1 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ip_nat_irc.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ip_nat_irc.c
@@ -39,7 +39,7 @@
 static int ports_c;
 
 MODULE_AUTHOR("Harald Welte <[email protected]>");
-MODULE_DESCRIPTION("IRC (DCC) network address translation module");
+MODULE_DESCRIPTION("IRC (DCC) NAT helper");
 MODULE_LICENSE("GPL");
 #ifdef MODULE_PARM
 MODULE_PARM(ports, "1-" __MODULE_STRING(MAX_PORTS) "i");
net/ipv4/netfilter/ip_nat_snmp_basic.c +3 -3
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ip_nat_snmp_basic.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ip_nat_snmp_basic.c
@@ -56,7 +56,9 @@
 #include <asm/uaccess.h>
 #include <asm/checksum.h>
 
-
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("James Morris <[email protected]>");
+MODULE_DESCRIPTION("Basic SNMP Application Layer Gateway");
 
 #define SNMP_PORT 161
 #define SNMP_TRAP_PORT 162
@@ -1357,5 +1359,3 @@
 module_exit(fini);
 
 MODULE_PARM(debug, "i");
-MODULE_DESCRIPTION("Basic SNMP Application Layer Gateway");
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ip_nat_tftp.c +1 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ip_nat_tftp.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ip_nat_tftp.c
@@ -30,7 +30,7 @@
 #include <linux/netfilter_ipv4/ip_nat_rule.h>
 
 MODULE_AUTHOR("Magnus Boden <[email protected]>");
-MODULE_DESCRIPTION("Netfilter NAT helper for tftp");
+MODULE_DESCRIPTION("tfpt NAT helper");
 MODULE_LICENSE("GPL");
 
 #define MAX_PORTS 8
net/ipv4/netfilter/ip_tables.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ip_tables.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ip_tables.c
@@ -25,6 +25,10 @@
 
 #include <linux/netfilter_ipv4/ip_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("IPv4 packet filter");
+
 /*#define DEBUG_IP_FIREWALL*/
 /*#define DEBUG_ALLOW_ALL*/ /* Useful for remote debugging */
 /*#define DEBUG_IP_FIREWALL_USER*/
@@ -1845,4 +1849,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipchains_core.c +3 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipchains_core.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipchains_core.c
@@ -100,6 +100,9 @@
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 
+MODULE_LICENSE("Dual BSD/GPL");
+MODULE_DESCRIPTION("ipchains backwards compatibility layer");
+
 /* Understanding locking in this code: (thanks to Alan Cox for using
  * little words to explain this to me). -- PR
  *
@@ -1842,4 +1845,3 @@
 #endif
 	return ret;
 }
-MODULE_LICENSE("Dual BSD/GPL");
net/ipv4/netfilter/ipfwadm_core.c +1 -0
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipfwadm_core.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipfwadm_core.c
@@ -134,6 +134,7 @@
 #include <linux/version.h>
 
 MODULE_LICENSE("Dual BSD/GPL");
+MODULE_DESCRIPTION("ipfwadm backwards compatibility layer");
 
 /*
  *	Implement IP packet firewall
net/ipv4/netfilter/ipt_DSCP.c +2 -2
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_DSCP.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_DSCP.c
@@ -17,8 +17,8 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_DSCP.h>
 
-MODULE_AUTHOR("Harald Welte <[email protected]>");
-MODULE_DESCRIPTION("IP tables DSCP modification module");
+MODULE_AUTHOR("Harald Welte <[email protected]>");
+MODULE_DESCRIPTION("iptables DSCP modification module");
 MODULE_LICENSE("GPL");
 
 static unsigned int
net/ipv4/netfilter/ipt_ECN.c +2 -0
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_ECN.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_ECN.c
@@ -17,6 +17,8 @@
 #include <linux/netfilter_ipv4/ipt_ECN.h>
 
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Harald Welte <[email protected]>");
+MODULE_DESCRIPTION("iptables ECN modification module");
 
 /* set ECT codepoint from IP header.
  * 	return 0 if there was an error. */
net/ipv4/netfilter/ipt_LOG.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_LOG.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_LOG.c
@@ -13,6 +13,10 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_LOG.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("iptables syslog logging module");
+
 #if 0
 #define DEBUGP printk
 #else
@@ -413,4 +417,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_MARK.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_MARK.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_MARK.c
@@ -7,6 +7,10 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_MARK.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Marc Boucher <[email protected]>");
+MODULE_DESCRIPTION("iptables MARK modification module");
+
 static unsigned int
 target(struct sk_buff **pskb,
        const struct net_device *in,
@@ -68,4 +72,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_MASQUERADE.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_MASQUERADE.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -12,6 +12,10 @@
 #include <linux/netfilter_ipv4/ip_nat_rule.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("iptables MASQUERADE target module");
+
 #if 0
 #define DEBUGP printk
 #else
@@ -213,4 +217,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_REDIRECT.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_REDIRECT.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_REDIRECT.c
@@ -12,6 +12,10 @@
 #include <linux/netfilter_ipv4.h>
 #include <linux/netfilter_ipv4/ip_nat_rule.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("iptables REDIRECT target module");
+
 #if 0
 #define DEBUGP printk
 #else
@@ -115,4 +119,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_REJECT.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_REJECT.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_REJECT.c
@@ -16,6 +16,10 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_REJECT.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("iptables REJECT target module");
+
 #if 0
 #define DEBUGP printk
 #else
@@ -462,4 +466,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_TCPMSS.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_TCPMSS.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_TCPMSS.c
@@ -12,6 +12,10 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_TCPMSS.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Marc Boucher <[email protected]>");
+MODULE_DESCRIPTION("iptables TCP MSS modification module");
+
 #if 0
 #define DEBUGP printk
 #else
@@ -250,4 +254,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_TOS.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_TOS.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_TOS.c
@@ -7,6 +7,10 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_TOS.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("iptables TOS mangling module");
+
 static unsigned int
 target(struct sk_buff **pskb,
        const struct net_device *in,
@@ -93,4 +97,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_ULOG.c +1 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_ULOG.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_ULOG.c
@@ -55,7 +55,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <[email protected]>");
-MODULE_DESCRIPTION("IP tables userspace logging module");
+MODULE_DESCRIPTION("iptables userspace logging module");
 
 #define ULOG_NL_EVENT		111		/* Harald's favorite number */
 #define ULOG_MAXNLGROUPS	32		/* numer of nlgroups */
net/ipv4/netfilter/ipt_ah.c +2 -0
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_ah.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_ah.c
@@ -7,6 +7,8 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Yon Uriarte <[email protected]>");
+MODULE_DESCRIPTION("iptables AH SPI match module");
 
 #ifdef DEBUG_CONNTRACK
 #define duprintf(format, args...) printk(format , ## args)
net/ipv4/netfilter/ipt_conntrack.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_conntrack.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_conntrack.c
@@ -8,6 +8,10 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_conntrack.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Marc Boucher <[email protected]>");
+MODULE_DESCRIPTION("iptables connection tracking match module");
+
 static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
@@ -122,4 +126,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_dscp.c +2 -2
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_dscp.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_dscp.c
@@ -13,8 +13,8 @@
 #include <linux/netfilter_ipv4/ipt_dscp.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 
-MODULE_AUTHOR("Harald Welte <[email protected]>");
-MODULE_DESCRIPTION("IP tables DSCP matching module");
+MODULE_AUTHOR("Harald Welte <[email protected]>");
+MODULE_DESCRIPTION("iptables DSCP matching module");
 MODULE_LICENSE("GPL");
 
 static int match(const struct sk_buff *skb, const struct net_device *in,
net/ipv4/netfilter/ipt_ecn.c +2 -2
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_ecn.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_ecn.c
@@ -14,8 +14,8 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_ecn.h>
 
-MODULE_AUTHOR("Harald Welte <[email protected]>");
-MODULE_DESCRIPTION("IP tables ECN matching module");
+MODULE_AUTHOR("Harald Welte <[email protected]>");
+MODULE_DESCRIPTION("iptables ECN matching module");
 MODULE_LICENSE("GPL");
 
 static inline int match_ip(const struct sk_buff *skb,
net/ipv4/netfilter/ipt_esp.c +2 -0
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_esp.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_esp.c
@@ -7,6 +7,8 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Yon Uriarte <[email protected]>");
+MODULE_DESCRIPTION("iptables ESP SPI match module");
 
 #ifdef DEBUG_CONNTRACK
 #define duprintf(format, args...) printk(format , ## args)
net/ipv4/netfilter/ipt_helper.c +2 -0
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_helper.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_helper.c
@@ -17,6 +17,8 @@
 #include <linux/netfilter_ipv4/ipt_helper.h>
 
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Martin Josefsson <[email protected]>");
+MODULE_DESCRIPTION("iptables helper match module");
 
 #if 0
 #define DEBUGP printk
net/ipv4/netfilter/ipt_limit.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_limit.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_limit.c
@@ -15,6 +15,10 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_limit.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Herve Eychenne <[email protected]>");
+MODULE_DESCRIPTION("iptables rate limit match");
+
 /* The algorithm used is the Simple Token Bucket Filter (TBF)
  * see net/sched/sch_tbf.c in the linux source tree
  */
@@ -134,4 +138,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_mac.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_mac.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_mac.c
@@ -6,6 +6,10 @@
 #include <linux/netfilter_ipv4/ipt_mac.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("iptables mac matching module");
+
 static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
@@ -64,4 +68,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_mark.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_mark.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_mark.c
@@ -5,6 +5,10 @@
 #include <linux/netfilter_ipv4/ipt_mark.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Marc Boucher <[email protected]>");
+MODULE_DESCRIPTION("iptables mark matching module");
+
 static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
@@ -50,4 +54,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_multiport.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_multiport.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_multiport.c
@@ -8,6 +8,10 @@
 #include <linux/netfilter_ipv4/ipt_multiport.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("iptables multiple port match module");
+
 #if 0
 #define duprintf(format, args...) printk(format , ## args)
 #else
@@ -106,4 +110,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_owner.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_owner.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_owner.c
@@ -11,6 +11,10 @@
 #include <linux/netfilter_ipv4/ipt_owner.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Marc Boucher <[email protected]>");
+MODULE_DESCRIPTION("iptables owner match");
+
 static int
 match_comm(const struct sk_buff *skb, const char *comm)
 {
@@ -198,4 +202,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_physdev.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_physdev.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_physdev.c
@@ -8,6 +8,10 @@
 #define MATCH   1
 #define NOMATCH 0
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Bart De Schuymer <[email protected]>");
+MODULE_DESCRIPTION("iptables bridge physical device match module");
+
 static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
@@ -120,4 +124,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_state.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_state.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_state.c
@@ -7,6 +7,10 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_state.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Rusty Russell <[email protected]>");
+MODULE_DESCRIPTION("iptables connection tracking state match module");
+
 static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
@@ -59,4 +63,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_tcpmss.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_tcpmss.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_tcpmss.c
@@ -8,6 +8,10 @@
 
 #define TH_SYN 0x02
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Marc Boucher <[email protected]>");
+MODULE_DESCRIPTION("iptables TCP MSS match module");
+
 /* Returns 1 if the mss option is set and matched by the range, 0 otherwise */
 static inline int
 mssoption_match(u_int16_t min, u_int16_t max,
@@ -117,4 +121,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_tos.c +3 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_tos.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_tos.c
@@ -5,6 +5,9 @@
 #include <linux/netfilter_ipv4/ipt_tos.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("iptables TOS match module");
+
 static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
@@ -50,4 +53,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/ipt_ttl.c +0 -0
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/ipt_ttl.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/ipt_ttl.c
net/ipv4/netfilter/iptable_filter.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/iptable_filter.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/iptable_filter.c
@@ -6,6 +6,10 @@
 #include <linux/module.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("iptables filter table");
+
 #define FILTER_VALID_HOOKS ((1 << NF_IP_LOCAL_IN) | (1 << NF_IP_FORWARD) | (1 << NF_IP_LOCAL_OUT))
 
 /* Standard entry. */
@@ -200,4 +204,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv4/netfilter/iptable_mangle.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv4/netfilter/iptable_mangle.c linux-2.6.0-test4-cosmetic/net/ipv4/netfilter/iptable_mangle.c
@@ -14,6 +14,10 @@
 #include <net/route.h>
 #include <linux/ip.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("iptables mangle table");
+
 #define MANGLE_VALID_HOOKS ((1 << NF_IP_PRE_ROUTING) | \
 			    (1 << NF_IP_LOCAL_IN) | \
 			    (1 << NF_IP_FORWARD) | \
@@ -267,4 +271,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv6/netfilter/ip6_tables.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv6/netfilter/ip6_tables.c linux-2.6.0-test4-cosmetic/net/ipv6/netfilter/ip6_tables.c
@@ -26,6 +26,10 @@
 
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("IPv6 packet filter");
+
 #define IPV6_HDR_LEN	(sizeof(struct ipv6hdr))
 #define IPV6_OPTHDR_LEN	(sizeof(struct ipv6_opt_hdr))
 
@@ -1923,4 +1927,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv6/netfilter/ip6t_MARK.c +3 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv6/netfilter/ip6t_MARK.c linux-2.6.0-test4-cosmetic/net/ipv6/netfilter/ip6t_MARK.c
@@ -7,6 +7,9 @@
 #include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter_ipv6/ip6t_MARK.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+
 static unsigned int
 target(struct sk_buff **pskb,
        unsigned int hooknum,
@@ -65,4 +68,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv6/netfilter/ip6t_eui64.c +4 -3
diff -Nru linux-2.6.0-test4-unclean/net/ipv6/netfilter/ip6t_eui64.c linux-2.6.0-test4-cosmetic/net/ipv6/netfilter/ip6t_eui64.c
@@ -6,6 +6,10 @@
 
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
+MODULE_DESCRIPTION("IPv6 EUI64 address checking match");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andras Kis-Szabo <[email protected]>");
+
 static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
@@ -88,6 +92,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_DESCRIPTION("IPv6 EUI64 address checking match");
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Andras Kis-Szabo <[email protected]>");
net/ipv6/netfilter/ip6t_length.c +4 -0
diff -Nru linux-2.6.0-test4-unclean/net/ipv6/netfilter/ip6t_length.c linux-2.6.0-test4-cosmetic/net/ipv6/netfilter/ip6t_length.c
@@ -5,6 +5,10 @@
 #include <linux/netfilter_ipv6/ip6t_length.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("James Morris <[email protected]>");
+MODULE_DESCRIPTION("IPv6 packet length match");
+
 static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
net/ipv6/netfilter/ip6t_limit.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv6/netfilter/ip6t_limit.c linux-2.6.0-test4-cosmetic/net/ipv6/netfilter/ip6t_limit.c
@@ -15,6 +15,10 @@
 #include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter_ipv6/ip6t_limit.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Herve Eychenne <[email protected]>");
+MODULE_DESCRIPTION("rate limiting within ip6tables");
+
 /* The algorithm used is the Simple Token Bucket Filter (TBF)
  * see net/sched/sch_tbf.c in the linux source tree
  */
@@ -136,4 +140,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv6/netfilter/ip6t_mac.c +4 -2
diff -Nru linux-2.6.0-test4-unclean/net/ipv6/netfilter/ip6t_mac.c linux-2.6.0-test4-cosmetic/net/ipv6/netfilter/ip6t_mac.c
@@ -6,6 +6,10 @@
 #include <linux/netfilter_ipv6/ip6t_mac.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("MAC address matching module for IPv6");
+MODULE_AUTHOR("Netfilter Core Teaam <[email protected]>");
+
 static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
@@ -66,5 +70,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("MAC address matching module for IPv6");
net/ipv6/netfilter/ip6t_mark.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv6/netfilter/ip6t_mark.c linux-2.6.0-test4-cosmetic/net/ipv6/netfilter/ip6t_mark.c
@@ -5,6 +5,10 @@
 #include <linux/netfilter_ipv6/ip6t_mark.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("ip6tables mark match");
+
 static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
@@ -52,4 +56,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv6/netfilter/ip6t_multiport.c +4 -0
diff -Nru linux-2.6.0-test4-unclean/net/ipv6/netfilter/ip6t_multiport.c linux-2.6.0-test4-cosmetic/net/ipv6/netfilter/ip6t_multiport.c
@@ -9,6 +9,10 @@
 #include <linux/netfilter_ipv6/ip6t_multiport.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("ip6tables match for multiple ports");
+
 #if 0
 #define duprintf(format, args...) printk(format , ## args)
 #else
net/ipv6/netfilter/ip6table_filter.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv6/netfilter/ip6table_filter.c linux-2.6.0-test4-cosmetic/net/ipv6/netfilter/ip6table_filter.c
@@ -6,6 +6,10 @@
 #include <linux/module.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("ip6tables filter table");
+
 #define FILTER_VALID_HOOKS ((1 << NF_IP6_LOCAL_IN) | (1 << NF_IP6_FORWARD) | (1 << NF_IP6_LOCAL_OUT))
 
 /* Standard entry. */
@@ -202,4 +206,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
net/ipv6/netfilter/ip6table_mangle.c +4 -1
diff -Nru linux-2.6.0-test4-unclean/net/ipv6/netfilter/ip6table_mangle.c linux-2.6.0-test4-cosmetic/net/ipv6/netfilter/ip6table_mangle.c
@@ -6,6 +6,10 @@
 #include <linux/module.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <[email protected]>");
+MODULE_DESCRIPTION("ip6tables mangle table");
+
 #define MANGLE_VALID_HOOKS ((1 << NF_IP6_PRE_ROUTING) | \
 			    (1 << NF_IP6_LOCAL_IN) | \
 			    (1 << NF_IP6_FORWARD) | \
@@ -279,4 +283,3 @@
 
 module_init(init);
 module_exit(fini);
-MODULE_LICENSE("GPL");
Signature · 5 lines
- Harald Welte <[email protected]>             http://www.netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie
#1 lore raw
Quoted 5 lines · On Sun, 24 Aug 2003 10:46:33 +0200 Harald Welte <[email protected]> wrote:

The following patch (against 2.6.0-test4) is purely cosmetic. It
- moves all MODULE_{AUTHOR,DESCRIPTION,LICENSE} statements to the same location
- adds some missing MODULE_LICENSE("GPL") tags
- adds MODULE_DESCRIPTION and AUTHOR to all modules

Applied, thanks.