From 30498b130cc0476e73f5142dcc63bc271da2d89b Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 5 Apr 2013 00:29:26 +0200 Subject: refresh patches against next-20130328 The patches were last refreshed against that same tree, so the only change is that now we have -p in there, which results in changes like this (only): -@@ -1593,7 +1593,7 @@ +@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_ This makes the patches more readable. Signed-off-by: Johannes Berg --- .../network/12-mac80211-disable-tx-status/net_mac80211_tx.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch') diff --git a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch index f5aeb836..5e92069e 100644 --- a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch +++ b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -2035,6 +2035,7 @@ +@@ -2035,6 +2035,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail_rcu; } @@ -8,7 +8,7 @@ if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { struct sk_buff *orig_skb = skb; -@@ -2063,6 +2064,7 @@ +@@ -2063,6 +2064,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } -- cgit v1.2.3