diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-08-05 02:19:08 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-08-05 02:19:08 -0300 |
| commit | 8dec7c70575785729a6a9e6719a955e9c545bcab (patch) | |
| tree | 897b1b743b2ceb44ace956e8176b6a7e36751019 /net/wireless | |
| parent | 4411a04f871d94ae997fb7262a428fe2ee988eb3 (diff) | |
Linux-libre 4.6.5-gnupck-4.6.5-gnu
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/core.c | 2 | ||||
| -rw-r--r-- | net/wireless/util.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 9f1c4aa85..c878045d1 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -360,8 +360,6 @@ struct wiphy *wiphy_new_nm(const struct cfg80211_ops *ops, int sizeof_priv, WARN_ON(ops->remain_on_channel && !ops->cancel_remain_on_channel); WARN_ON(ops->tdls_channel_switch && !ops->tdls_cancel_channel_switch); WARN_ON(ops->add_tx_ts && !ops->del_tx_ts); - WARN_ON(ops->set_tx_power && !ops->get_tx_power); - WARN_ON(ops->set_antenna && !ops->get_antenna); alloc_size = sizeof(*rdev) + sizeof_priv; diff --git a/net/wireless/util.c b/net/wireless/util.c index 9f440a9de..47b917841 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -509,7 +509,7 @@ static int __ieee80211_data_to_8023(struct sk_buff *skb, struct ethhdr *ehdr, * replace EtherType */ hdrlen += ETH_ALEN + 2; else - tmp.h_proto = htons(skb->len); + tmp.h_proto = htons(skb->len - hdrlen); pskb_pull(skb, hdrlen); |