Commit b9066c26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)
  [IPSEC]: Add xfrm_sysctl.txt.
  [BRIDGE]: Round off STP perodic timers.
  [BRIDGE]: Reduce frequency of forwarding cleanup timer in bridge.
  [TCP] tcp_probe: use GCC printf attribute
  [TCP] tcp_probe: a trivial fix for mismatched number of printl arguments.
  [IPV6] ADDRCONF: Fix conflicts in DEVCONF_xxx constant.
  [NET] napi: Call __netif_rx_complete in netif_rx_complete
  [TCP]: Consolidate checking for tcp orphan count being too big.
  [SOCK]: Shrink struct sock by 8 bytes on 64-bit.
  [AF_PACKET]: Kill CONFIG_PACKET_SOCKET.
  [IPV6]: Fix build warning.
  [AF_PACKET]: Kill bogus CONFIG_PACKET_MULTICAST
  [IPV4]: Kill references to bogus non-existent CONFIG_IP_NOSIOCRT
  [IPSEC]: Fix panic when using inter address familiy IPsec on loopback.
  [NET]: parse ip:port strings correctly in in4_pton
  [IPV6] ROUTE: No longer handle ::/0 specially.
  [IPSEC]: Fix IPv6 AH calculation in outbound
  [XFRM]: xfrm_larval_drop sysctl should be __read_mostly.
  [XFRM]: Allow XFRM_ACQ_EXPIRES to be tunable via sysctl.
  [CASSINI]: Fix printk message typo.
  ...
parents 0c27011a 85553dda

Documentation/networking/xfrm_sysctl.txt

0 → 100644
+4 −0
Original line number Diff line number Diff line 
/proc/sys/net/core/xfrm_* Variables:



xfrm_acq_expires - INTEGER

	default 30 - hard timeout in seconds for acquire requests

drivers/net/cassini.c

+1 −1
Original line number Diff line number Diff line
@@ -4920,7 +4920,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev, 
	pci_cmd |= PCI_COMMAND_PARITY;

	pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);

	if (pci_set_mwi(pdev))

		printk(KERN_WARNING PFX "Could enable MWI for %s\n",

		printk(KERN_WARNING PFX "Could not enable MWI for %s\n",

		       pci_name(pdev));



	/*

include/linux/ipv6.h

+1 −2
Original line number Diff line number Diff line
@@ -209,9 +209,8 @@ enum { 
	DEVCONF_RTR_PROBE_INTERVAL,

	DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,

	DEVCONF_PROXY_NDP,

	__DEVCONF_OPTIMISTIC_DAD,

	DEVCONF_ACCEPT_SOURCE_ROUTE,

	DEVCONF_OPTIMISTIC_DAD,

	DEVCONF_ACCEPT_SOURCE_ROUTE,

	DEVCONF_MAX

};

include/linux/netdevice.h

+12 −15
Original line number Diff line number Diff line
@@ -910,6 +910,17 @@ static inline int netif_rx_reschedule(struct net_device *dev, int undo) 
	return 0;

}



/* same as netif_rx_complete, except that local_irq_save(flags)

 * has already been issued

 */

static inline void __netif_rx_complete(struct net_device *dev)

{

	BUG_ON(!test_bit(__LINK_STATE_RX_SCHED, &dev->state));

	list_del(&dev->poll_list);

	smp_mb__before_clear_bit();

	clear_bit(__LINK_STATE_RX_SCHED, &dev->state);

}



/* Remove interface from poll list: it must be in the poll list

 * on current cpu. This primitive is called by dev->poll(), when

 * it completes the work. The device cannot be out of poll list at this
@@ -920,10 +931,7 @@ static inline void netif_rx_complete(struct net_device *dev) 
	unsigned long flags;



	local_irq_save(flags);

	BUG_ON(!test_bit(__LINK_STATE_RX_SCHED, &dev->state));

	list_del(&dev->poll_list);

	smp_mb__before_clear_bit();

	clear_bit(__LINK_STATE_RX_SCHED, &dev->state);

	__netif_rx_complete(dev);

	local_irq_restore(flags);

}
@@ -940,17 +948,6 @@ static inline void netif_poll_enable(struct net_device *dev) 
	clear_bit(__LINK_STATE_RX_SCHED, &dev->state);

}



/* same as netif_rx_complete, except that local_irq_save(flags)

 * has already been issued

 */

static inline void __netif_rx_complete(struct net_device *dev)

{

	BUG_ON(!test_bit(__LINK_STATE_RX_SCHED, &dev->state));

	list_del(&dev->poll_list);

	smp_mb__before_clear_bit();

	clear_bit(__LINK_STATE_RX_SCHED, &dev->state);

}



static inline void netif_tx_lock(struct net_device *dev)

{

	spin_lock(&dev->_xmit_lock);

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -218,13 +218,13 @@ struct sock { 
	atomic_t		sk_rmem_alloc;

	atomic_t		sk_wmem_alloc;

	atomic_t		sk_omem_alloc;

	int			sk_sndbuf;

	struct sk_buff_head	sk_receive_queue;

	struct sk_buff_head	sk_write_queue;

	struct sk_buff_head	sk_async_wait_queue;

	int			sk_wmem_queued;

	int			sk_forward_alloc;

	gfp_t			sk_allocation;

	int			sk_sndbuf;

	int			sk_route_caps;

	int			sk_gso_type;

	int			sk_rcvlowat;

CRA Git | Maintained and supported by SUSTech CRA and CCSE