From: David S. Miller <davem@davemloft.net>
Date: Wed, 9 Oct 2013 03:07:53 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.13-rc1~105^2~209
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=53af53ae83fe960ceb9ef74cac7915e9088f4266;p=~emulex%2Finfiniband.git

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

Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

Signed-off-by: David S. Miller <davem@davemloft.net>
---

53af53ae83fe960ceb9ef74cac7915e9088f4266
diff --cc include/linux/netdevice.h
index 6d77e0f3cc1,25f5d2d11e7..2e53b44454a
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -2273,11 -2264,12 +2273,11 @@@ static inline void netif_wake_subqueue(
  }
  
  #ifdef CONFIG_XPS
- int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask,
 -extern int netif_set_xps_queue(struct net_device *dev,
 -			       const struct cpumask *mask,
 -			       u16 index);
++int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask,
 +			u16 index);
  #else
  static inline int netif_set_xps_queue(struct net_device *dev,
- 				      struct cpumask *mask,
+ 				      const struct cpumask *mask,
  				      u16 index)
  {
  	return 0;
diff --cc net/core/sock.c
index 2bd9b3faa0d,0b39e7ae438..fd6afa26747
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@@ -2330,7 -2319,7 +2330,8 @@@ void sock_init_data(struct socket *sock
  	sk->sk_ll_usec		=	sysctl_net_busy_read;
  #endif
  
 +	sk->sk_max_pacing_rate = ~0U;
+ 	sk->sk_pacing_rate = ~0U;
  	/*
  	 * Before updating sk_refcnt, we must commit prior changes to memory
  	 * (Documentation/RCU/rculist_nulls.txt for details)