linux-next: manual merge of the net-next tree with the iwlwifi tree

[Mark Brown]

Hi all,

Today's linux-next merge of the net-next tree got conflicts in:

  net/mac80211/ieee80211_i.h
  net/mac80211/tx.c

between commit:

  8effab902fa34 ("wifi: mac80211: prevent AP VLAN tx from other interfaces")

from the iwlwifi tree and commit:

  78b843974fb83 ("wifi: mac80211: report multicast transmission from lookup_ra_sta()")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc net/mac80211/ieee80211_i.h
index 9374c2942489c,10767666c45c0..0000000000000
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
diff --cc net/mac80211/tx.c
index c8217f6d146e7,83b758724edff..0000000000000
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@@ -2530,9 -2579,16 +2579,16 @@@ static inline bool ieee80211_is_tdls_se
  	       skb->data[14] == WLAN_TDLS_SNAP_RFTYPE;
  }
  
- int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata,
- 			    struct sk_buff *skb,
- 			    struct sta_info **sta_out, bool bss)
+ /*
+  * Returns an error if the frame should be dropped, otherwise
+  * the *sta_out pointer is filled:
+  *  - valid sta pointer: frame goes to that station
+  *  - NULL: frame will be unicast to a yet unknown station
+  *  - ERR_PTR(-ENOENT): frame will be group addressed
+  */
+ static int ieee80211_lookup_ra_sta(struct ieee80211_sub_if_data *sdata,
+ 				   struct sk_buff *skb,
 -				   struct sta_info **sta_out)
++				   struct sta_info **sta_out, bool bss)
  {
  	struct sta_info *sta;
  
@@@ -4422,10 -4426,10 +4429,11 @@@ void __ieee80211_subif_start_xmit(struc
  	    ieee80211_mesh_xmit_fast(sdata, skb, ctrl_flags))
  		goto out;
  
 -	if (ieee80211_lookup_ra_sta(sdata, skb, &sta))
 +	if (ieee80211_lookup_ra_sta(sdata, skb, &sta,
 +				    skb->protocol == sdata->control_port_protocol))
  		goto out_free;
  
+ 	group_addressed = IS_ERR(sta);
  	if (IS_ERR(sta))
  		sta = NULL;

Attachment: signature.asc
Description: PGP signature