diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-09-05 05:40:54 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-09-05 05:40:54 -0400 |
| commit | 151a41014bff92f353263cadc051435dc9c3258e (patch) | |
| tree | aa082a0745edd5b7051668f455dfc0ee1e4a9de0 /net/mac80211/iface.c | |
| parent | ae0755b56da9db4190288155ea884331993ed51b (diff) | |
| parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) | |
Merge tag 'v5.3-rc7' into devel
Linux 5.3-rc7
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 06aac0aaae64..8dc6580e1787 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
| @@ -1222,7 +1222,6 @@ static void ieee80211_if_setup(struct net_device *dev) | |||
| 1222 | static void ieee80211_if_setup_no_queue(struct net_device *dev) | 1222 | static void ieee80211_if_setup_no_queue(struct net_device *dev) |
| 1223 | { | 1223 | { |
| 1224 | ieee80211_if_setup(dev); | 1224 | ieee80211_if_setup(dev); |
| 1225 | dev->features |= NETIF_F_LLTX; | ||
| 1226 | dev->priv_flags |= IFF_NO_QUEUE; | 1225 | dev->priv_flags |= IFF_NO_QUEUE; |
| 1227 | } | 1226 | } |
| 1228 | 1227 | ||