diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-04 22:45:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-04 22:45:14 -0500 |
| commit | 00a1f0a93dea3cf1c141df79bfd06e7c9ee54162 (patch) | |
| tree | b209c79368a94aeb3694f2ff4158288156fae9ba /net/wireless | |
| parent | 94f7153e41d834824f4108d832f1935603e73105 (diff) | |
| parent | 3ef523aeeee88130e5de10adac719dbd6fa266e5 (diff) | |
Merge branch 'reset_mac_header'
Zhang Shengju says:
====================
use reset to set header pointers
This patch series replace set function with reset when offset is zero.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index c7f6820bb258..9f440a9de63b 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -636,7 +636,7 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr, /* Update skb pointers to various headers since this modified frame * is going to go through Linux networking code that may potentially * need things like pointer to IP header. */ - skb_set_mac_header(skb, 0); + skb_reset_mac_header(skb); skb_set_network_header(skb, nh_pos); skb_set_transport_header(skb, h_pos); |