Commit 10799db6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: Kill ratelimit.h dependency in linux/net.h
  net: Add linux/sysctl.h includes where needed.
  net: Kill ether_table[] declaration.
  inetpeer: fix race in unused_list manipulations
  atm: expose ATM device index in sysfs
  IPVS: bug in ip_vs_ftp, same list heaad used in all netns.
  bug.h: Move ratelimit warn interfaces to ratelimit.h
  bonding: cleanup module option descriptions
  net:8021q:vlan.c Fix pr_info to just give the vlan fullname and version.
  net: davinci_emac: fix dev_err use at probe
  can: convert to %pK for kptr_restrict support
  net: fix ETHTOOL_SFEATURES compatibility with old ethtool_ops.set_flags
  netfilter: Fix several warnings in compat_mtw_from_user().
  netfilter: ipset: fix ip_set_flush return code
  netfilter: ipset: remove unused variable from type_pf_tdel()
  netfilter: ipset: Use proper timeout value to jiffies conversion
parents aaab1842 c5c177b4

drivers/net/bonding/bond_main.c

+22 −12
Original line number Diff line number Diff line
@@ -113,9 +113,11 @@ MODULE_PARM_DESC(max_bonds, "Max number of bonded devices"); 
module_param(tx_queues, int, 0);

MODULE_PARM_DESC(tx_queues, "Max number of transmit queues (default = 16)");

module_param_named(num_grat_arp, num_peer_notif, int, 0644);

MODULE_PARM_DESC(num_grat_arp, "Number of peer notifications to send on failover event (alias of num_unsol_na)");

MODULE_PARM_DESC(num_grat_arp, "Number of peer notifications to send on "

			       "failover event (alias of num_unsol_na)");

module_param_named(num_unsol_na, num_peer_notif, int, 0644);

MODULE_PARM_DESC(num_unsol_na, "Number of peer notifications to send on failover event (alias of num_grat_arp)");

MODULE_PARM_DESC(num_unsol_na, "Number of peer notifications to send on "

			       "failover event (alias of num_grat_arp)");

module_param(miimon, int, 0);

MODULE_PARM_DESC(miimon, "Link check interval in milliseconds");

module_param(updelay, int, 0);
@@ -127,7 +129,7 @@ module_param(use_carrier, int, 0); 
MODULE_PARM_DESC(use_carrier, "Use netif_carrier_ok (vs MII ioctls) in miimon; "

			      "0 for off, 1 for on (default)");

module_param(mode, charp, 0);

MODULE_PARM_DESC(mode, "Mode of operation : 0 for balance-rr, "

MODULE_PARM_DESC(mode, "Mode of operation; 0 for balance-rr, "

		       "1 for active-backup, 2 for balance-xor, "

		       "3 for broadcast, 4 for 802.3ad, 5 for balance-tlb, "

		       "6 for balance-alb");
@@ -142,27 +144,35 @@ MODULE_PARM_DESC(primary_reselect, "Reselect primary slave " 
				   "2 for only on active slave "

				   "failure");

module_param(lacp_rate, charp, 0);

MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner "

			    "(slow/fast)");

MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner; "

			    "0 for slow, 1 for fast");

module_param(ad_select, charp, 0);

MODULE_PARM_DESC(ad_select, "803.ad aggregation selection logic: stable (0, default), bandwidth (1), count (2)");

MODULE_PARM_DESC(ad_select, "803.ad aggregation selection logic; "

			    "0 for stable (default), 1 for bandwidth, "

			    "2 for count");

module_param(xmit_hash_policy, charp, 0);

MODULE_PARM_DESC(xmit_hash_policy, "XOR hashing method: 0 for layer 2 (default)"

				   ", 1 for layer 3+4");

MODULE_PARM_DESC(xmit_hash_policy, "balance-xor and 802.3ad hashing method; "

				   "0 for layer 2 (default), 1 for layer 3+4, "

				   "2 for layer 2+3");

module_param(arp_interval, int, 0);

MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds");

module_param_array(arp_ip_target, charp, NULL, 0);

MODULE_PARM_DESC(arp_ip_target, "arp targets in n.n.n.n form");

module_param(arp_validate, charp, 0);

MODULE_PARM_DESC(arp_validate, "validate src/dst of ARP probes: none (default), active, backup or all");

MODULE_PARM_DESC(arp_validate, "validate src/dst of ARP probes; "

			       "0 for none (default), 1 for active, "

			       "2 for backup, 3 for all");

module_param(fail_over_mac, charp, 0);

MODULE_PARM_DESC(fail_over_mac, "For active-backup, do not set all slaves to the same MAC.  none (default), active or follow");

MODULE_PARM_DESC(fail_over_mac, "For active-backup, do not set all slaves to "

				"the same MAC; 0 for none (default), "

				"1 for active, 2 for follow");

module_param(all_slaves_active, int, 0);

MODULE_PARM_DESC(all_slaves_active, "Keep all frames received on an interface"

				     "by setting active flag for all slaves.  "

				     "by setting active flag for all slaves; "

				     "0 for never (default), 1 for always.");

module_param(resend_igmp, int, 0);

MODULE_PARM_DESC(resend_igmp, "Number of IGMP membership reports to send on link failure");

MODULE_PARM_DESC(resend_igmp, "Number of IGMP membership reports to send on "

			      "link failure");



/*----------------------------- Global variables ----------------------------*/

drivers/net/davinci_emac.c

+11 −11
Original line number Diff line number Diff line
@@ -1772,7 +1772,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 
	/* obtain emac clock from kernel */

	emac_clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(emac_clk)) {

		printk(KERN_ERR "DaVinci EMAC: Failed to get EMAC clock\n");

		dev_err(&pdev->dev, "failed to get EMAC clock\n");

		return -EBUSY;

	}

	emac_bus_frequency = clk_get_rate(emac_clk);
@@ -1780,7 +1780,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 


	ndev = alloc_etherdev(sizeof(struct emac_priv));

	if (!ndev) {

		printk(KERN_ERR "DaVinci EMAC: Error allocating net_device\n");

		dev_err(&pdev->dev, "error allocating net_device\n");

		clk_put(emac_clk);

		return -ENOMEM;

	}
@@ -1795,7 +1795,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 


	pdata = pdev->dev.platform_data;

	if (!pdata) {

		printk(KERN_ERR "DaVinci EMAC: No platform data\n");

		dev_err(&pdev->dev, "no platform data\n");

		return -ENODEV;

	}
@@ -1814,7 +1814,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 
	/* Get EMAC platform data */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(emac_dev, "DaVinci EMAC: Error getting res\n");

		dev_err(&pdev->dev,"error getting res\n");

		rc = -ENOENT;

		goto probe_quit;

	}
@@ -1822,14 +1822,14 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 
	priv->emac_base_phys = res->start + pdata->ctrl_reg_offset;

	size = res->end - res->start + 1;

	if (!request_mem_region(res->start, size, ndev->name)) {

		dev_err(emac_dev, "DaVinci EMAC: failed request_mem_region() for regs\n");

		dev_err(&pdev->dev, "failed request_mem_region() for regs\n");

		rc = -ENXIO;

		goto probe_quit;

	}



	priv->remap_addr = ioremap(res->start, size);

	if (!priv->remap_addr) {

		dev_err(emac_dev, "Unable to map IO\n");

		dev_err(&pdev->dev, "unable to map IO\n");

		rc = -ENOMEM;

		release_mem_region(res->start, size);

		goto probe_quit;
@@ -1863,7 +1863,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 


	priv->dma = cpdma_ctlr_create(&dma_params);

	if (!priv->dma) {

		dev_err(emac_dev, "DaVinci EMAC: Error initializing DMA\n");

		dev_err(&pdev->dev, "error initializing DMA\n");

		rc = -ENOMEM;

		goto no_dma;

	}
@@ -1879,7 +1879,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!res) {

		dev_err(emac_dev, "DaVinci EMAC: Error getting irq res\n");

		dev_err(&pdev->dev, "error getting irq res\n");

		rc = -ENOENT;

		goto no_irq_res;

	}
@@ -1888,8 +1888,8 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 
	if (!is_valid_ether_addr(priv->mac_addr)) {

		/* Use random MAC if none passed */

		random_ether_addr(priv->mac_addr);

		printk(KERN_WARNING "%s: using random MAC addr: %pM\n",

				__func__, priv->mac_addr);

		dev_warn(&pdev->dev, "using random MAC addr: %pM\n",

							priv->mac_addr);

	}



	ndev->netdev_ops = &emac_netdev_ops;
@@ -1902,7 +1902,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 
	SET_NETDEV_DEV(ndev, &pdev->dev);

	rc = register_netdev(ndev);

	if (rc) {

		dev_err(emac_dev, "DaVinci EMAC: Error in register_netdev\n");

		dev_err(&pdev->dev, "error in register_netdev\n");

		rc = -ENODEV;

		goto netdev_reg_err;

	}

include/asm-generic/bug.h

+0 −40
Original line number Diff line number Diff line
@@ -162,46 +162,6 @@ extern void warn_slowpath_null(const char *file, const int line); 
	unlikely(__ret_warn_once);				\

})



#ifdef CONFIG_PRINTK



#define WARN_ON_RATELIMIT(condition, state)			\

		WARN_ON((condition) && __ratelimit(state))



#define __WARN_RATELIMIT(condition, state, format...)		\

({								\

	int rtn = 0;						\

	if (unlikely(__ratelimit(state)))			\

		rtn = WARN(condition, format);			\

	rtn;							\

})



#define WARN_RATELIMIT(condition, format...)			\

({								\

	static DEFINE_RATELIMIT_STATE(_rs,			\

				      DEFAULT_RATELIMIT_INTERVAL,	\

				      DEFAULT_RATELIMIT_BURST);	\

	__WARN_RATELIMIT(condition, &_rs, format);		\

})



#else



#define WARN_ON_RATELIMIT(condition, state)			\

	WARN_ON(condition)



#define __WARN_RATELIMIT(condition, state, format...)		\

({								\

	int rtn = WARN(condition, format);			\

	rtn;							\

})



#define WARN_RATELIMIT(condition, format...)			\

({								\

	int rtn = WARN(condition, format);			\

	rtn;							\

})



#endif



/*

 * WARN_ON_SMP() is for cases that the warning is either

 * meaningless for !SMP or may even cause failures.

include/linux/if_ether.h

+0 −4
Original line number Diff line number Diff line
@@ -132,10 +132,6 @@ static inline struct ethhdr *eth_hdr(const struct sk_buff *skb) 


int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr);



#ifdef CONFIG_SYSCTL

extern struct ctl_table ether_table[];

#endif



int mac_pton(const char *s, u8 *mac);

extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);

include/linux/net.h

+0 −6
Original line number Diff line number Diff line
@@ -289,11 +289,5 @@ extern int kernel_sock_shutdown(struct socket *sock, 
	MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \

		     "-type-" __stringify(type))



#ifdef CONFIG_SYSCTL

#include <linux/sysctl.h>

#include <linux/ratelimit.h>

extern struct ratelimit_state net_ratelimit_state;

#endif



#endif /* __KERNEL__ */

#endif	/* _LINUX_NET_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE