From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 15 Feb 2008 15:33:07 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.25-rc2~2
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/f6866fecd6fd8e44a6715da09844a4fd1b8484da?hp=-c

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: (82 commits)
  [NET]: Make sure sockets implement splice_read
  netconsole: avoid null pointer dereference at show_local_mac()
  [IPV6]: Fix reversed local_df test in ip6_fragment
  [XFRM]: Avoid bogus BUG() when throwing new policy away.
  [AF_KEY]: Fix bug in spdadd
  [NETFILTER] nf_conntrack_proto_tcp.c: Mistyped state corrected.
  net: xfrm statistics depend on INET
  [NETFILTER]: make secmark_tg_destroy() static
  [INET]: Unexport inet_listen_wlock
  [INET]: Unexport __inet_hash_connect
  [NET]: Improve cache line coherency of ingress qdisc
  [NET]: Fix race in dev_close(). (Bug 9750)
  [IPSEC]: Fix bogus usage of u64 on input sequence number
  [RTNETLINK]: Send a single notification on device state changes.
  [NETLABLE]: Hide netlbl_unlabel_audit_addr6 under ifdef CONFIG_IPV6.
  [NETLABEL]: Don't produce unused variables when IPv6 is off.
  [NETLABEL]: Compilation for CONFIG_AUDIT=n case.
  [GENETLINK]: Relax dances with genl_lock.
  [NETLABEL]: Fix lookup logic of netlbl_domhsh_search_def.
  [IPV6]: remove unused method declaration (net/ndisc.h).
  ...
---

f6866fecd6fd8e44a6715da09844a4fd1b8484da
diff --combined include/linux/netdevice.h
index 7128a02f1d37,4ffa49dbb66f..a2f003239c85
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -322,7 -322,7 +322,7 @@@ enu
  	NAPI_STATE_DISABLE,	/* Disable pending */
  };
  
 -extern void FASTCALL(__napi_schedule(struct napi_struct *n));
 +extern void __napi_schedule(struct napi_struct *n);
  
  static inline int napi_disable_pending(struct napi_struct *n)
  {
@@@ -604,6 -604,10 +604,10 @@@ struct net_devic
  
  	unsigned char		broadcast[MAX_ADDR_LEN];	/* hw bcast add	*/
  
+ 	/* ingress path synchronizer */
+ 	spinlock_t		ingress_lock;
+ 	struct Qdisc		*qdisc_ingress;
+ 
  /*
   * Cache line mostly used on queue transmit path (qdisc)
   */
@@@ -617,10 -621,6 +621,6 @@@
  	/* Partially transmitted GSO packet. */
  	struct sk_buff		*gso_skb;
  
- 	/* ingress path synchronizer */
- 	spinlock_t		ingress_lock;
- 	struct Qdisc		*qdisc_ingress;
- 
  /*
   * One part is mostly used on xmit path (device)
   */
diff --combined net/core/dev.c
index b3e19ae57f95,6cfc1238c4a6..908f07c3bd7d
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -1071,8 -1071,6 +1071,6 @@@ int dev_close(struct net_device *dev
  	 */
  	call_netdevice_notifiers(NETDEV_GOING_DOWN, dev);
  
- 	dev_deactivate(dev);
- 
  	clear_bit(__LINK_STATE_START, &dev->state);
  
  	/* Synchronize to scheduled poll. We cannot touch poll list,
@@@ -1083,6 -1081,8 +1081,8 @@@
  	 */
  	smp_mb__after_clear_bit(); /* Commit netif_running(). */
  
+ 	dev_deactivate(dev);
+ 
  	/*
  	 *	Call the device specific close. This cannot fail.
  	 *	Only if device is UP
@@@ -2143,7 -2143,7 +2143,7 @@@ static int process_backlog(struct napi_
   *
   * The entry's receive function will be scheduled to run
   */
 -void fastcall __napi_schedule(struct napi_struct *n)
 +void __napi_schedule(struct napi_struct *n)
  {
  	unsigned long flags;
  
@@@ -3038,7 -3038,8 +3038,7 @@@ int dev_unicast_sync(struct net_device 
  EXPORT_SYMBOL(dev_unicast_sync);
  
  /**
 - *	dev_unicast_unsync - Remove synchronized addresses from the destination
 - *			     device
 + *	dev_unicast_unsync - Remove synchronized addresses from the destination device
   *	@to: destination device
   *	@from: source device
   *
diff --combined net/core/skbuff.c
index cfc07dac636c,40dddcc6dc32..0d0fd28a9041
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@@ -1907,11 -1907,11 +1907,11 @@@ void skb_prepare_seq_read(struct sk_buf
   * of bytes already consumed and the next call to
   * skb_seq_read() will return the remaining part of the block.
   *
 - * Note: The size of each block of data returned can be arbitary,
 + * Note 1: The size of each block of data returned can be arbitary,
   *       this limitation is the cost for zerocopy seqeuental
   *       reads of potentially non linear data.
   *
 - * Note: Fragment lists within fragments are not implemented
 + * Note 2: Fragment lists within fragments are not implemented
   *       at the moment, state->root_skb could be replaced with
   *       a stack for this purpose.
   */
@@@ -2106,11 -2106,10 +2106,10 @@@ int skb_append_datato_frags(struct soc
  /**
   *	skb_pull_rcsum - pull skb and update receive checksum
   *	@skb: buffer to update
-  *	@start: start of data before pull
   *	@len: length of data pulled
   *
   *	This function performs an skb_pull on the packet and updates
-  *	update the CHECKSUM_COMPLETE checksum.  It should be used on
+  *	the CHECKSUM_COMPLETE checksum.  It should be used on
   *	receive path processing instead of skb_pull unless you know
   *	that the checksum difference is zero (e.g., a valid IP header)
   *	or you are setting ip_summed to CHECKSUM_NONE.