From: David S. Miller <davem@davemloft.net>
Date: Sat, 15 Mar 2014 02:31:55 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=85dcce7a73f1cc59f7a96fe52713b1630f4ca272;p=linux-beck.git

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

Conflicts:
	drivers/net/usb/r8152.c
	drivers/net/xen-netback/netback.c

Both the r8152 and netback conflicts were simple overlapping
changes.

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

85dcce7a73f1cc59f7a96fe52713b1630f4ca272
diff --cc drivers/net/bonding/bond_options.c
index 22800bde9752,298c26509095..6e6b09359ec3
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@@ -173,12 -118,13 +173,13 @@@ static const struct bond_opt_value bond
  	{ NULL,      -1,  0}
  };
  
 -static struct bond_opt_value bond_lp_interval_tbl[] = {
 +static const struct bond_opt_value bond_lp_interval_tbl[] = {
  	{ "minval",  1,       BOND_VALFLAG_MIN | BOND_VALFLAG_DEFAULT},
  	{ "maxval",  INT_MAX, BOND_VALFLAG_MAX},
+ 	{ NULL,      -1,      0},
  };
  
 -static struct bond_option bond_opts[] = {
 +static const struct bond_option bond_opts[] = {
  	[BOND_OPT_MODE] = {
  		.id = BOND_OPT_MODE,
  		.name = "mode",
diff --cc drivers/net/wireless/mwifiex/11ac.c
index bb43251c18f2,5d9a8084665d..c92f27aa71ed
--- a/drivers/net/wireless/mwifiex/11ac.c
+++ b/drivers/net/wireless/mwifiex/11ac.c
@@@ -192,12 -189,10 +192,11 @@@ int mwifiex_cmd_append_11ac_tlv(struct 
  		vht_cap->header.len  =
  				cpu_to_le16(sizeof(struct ieee80211_vht_cap));
  		memcpy((u8 *)vht_cap + sizeof(struct mwifiex_ie_types_header),
- 		       (u8 *)bss_desc->bcn_vht_cap +
- 		       sizeof(struct ieee_types_header),
+ 		       (u8 *)bss_desc->bcn_vht_cap,
  		       le16_to_cpu(vht_cap->header.len));
  
 -		mwifiex_fill_vht_cap_tlv(priv, vht_cap, bss_desc->bss_band);
 +		mwifiex_fill_vht_cap_tlv(priv, &vht_cap->vht_cap,
 +					 bss_desc->bss_band);
  		*buffer += sizeof(*vht_cap);
  		ret_len += sizeof(*vht_cap);
  	}
diff --cc drivers/net/wireless/mwifiex/11n.c
index 79ead928a64e,7db1a89fdd95..d9c65b60cd72
--- a/drivers/net/wireless/mwifiex/11n.c
+++ b/drivers/net/wireless/mwifiex/11n.c
@@@ -317,11 -308,10 +317,10 @@@ mwifiex_cmd_append_11n_tlv(struct mwifi
  		ht_cap->header.len =
  				cpu_to_le16(sizeof(struct ieee80211_ht_cap));
  		memcpy((u8 *) ht_cap + sizeof(struct mwifiex_ie_types_header),
- 		       (u8 *) bss_desc->bcn_ht_cap +
- 		       sizeof(struct ieee_types_header),
+ 		       (u8 *)bss_desc->bcn_ht_cap,
  		       le16_to_cpu(ht_cap->header.len));
  
 -		mwifiex_fill_cap_info(priv, radio_type, ht_cap);
 +		mwifiex_fill_cap_info(priv, radio_type, &ht_cap->ht_cap);
  
  		*buffer += sizeof(struct mwifiex_ie_types_htcap);
  		ret_len += sizeof(struct mwifiex_ie_types_htcap);
diff --cc drivers/net/xen-netback/netback.c
index bc943205a691,438d0c09b7e6..5a8c4a43c522
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@@ -348,10 -338,6 +348,9 @@@ static int xenvif_gop_skb(struct sk_buf
  	int head = 1;
  	int old_meta_prod;
  	int gso_type;
- 	int gso_size;
 +	struct ubuf_info *ubuf = skb_shinfo(skb)->destructor_arg;
 +	grant_ref_t foreign_grefs[MAX_SKB_FRAGS];
 +	struct xenvif *foreign_vif = NULL;
  
  	old_meta_prod = npo->meta_prod;