diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-01-02 13:12:14 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-01-02 13:12:14 -0500 |
| commit | 71a51f80d930faf4b54637f10305e295a05389fc (patch) | |
| tree | 6b2a9ba3c09fb34a40d94c703d09e1f37643b15e /net | |
| parent | e88b1c51941d964e77ef7e9099075ae2e8dafd75 (diff) | |
| parent | 095f493c4d532b0ced3aee22e2d5b2cea02aa773 (diff) | |
Merge tag 'v3.10.25' into v3.10-rt
This is the 3.10.25 stable release
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/udp.c | 3 | ||||
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 | ||||
| -rw-r--r-- | net/mac80211/cfg.c | 3 | ||||
| -rw-r--r-- | net/mac80211/rx.c | 3 |
4 files changed, 3 insertions, 8 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 233f1911dc34..c3075b552248 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1073,9 +1073,6 @@ int udp_sendpage(struct sock *sk, struct page *page, int offset, if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; - if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; - if (!up->pending) { struct msghdr msg = { .msg_flags = flags|MSG_MORE }; diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 0516ebbea80b..209bb4d6e188 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1711,8 +1711,6 @@ static void __net_exit ip6_tnl_destroy_tunnels(struct ip6_tnl_net *ip6n) } } - t = rtnl_dereference(ip6n->tnls_wc[0]); - unregister_netdevice_queue(t->dev, &list); unregister_netdevice_many(&list); } diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 5ab17b82605d..18687f1fca75 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2356,8 +2356,7 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); - if (sdata->vif.type != NL80211_IFTYPE_STATION && - sdata->vif.type != NL80211_IFTYPE_MESH_POINT) + if (sdata->vif.type != NL80211_IFTYPE_STATION) return -EOPNOTSUPP; if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_PS)) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index dab14523bff2..dad437ed7464 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -864,7 +864,8 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx, u16 sc; u8 tid, ack_policy; - if (!ieee80211_is_data_qos(hdr->frame_control)) + if (!ieee80211_is_data_qos(hdr->frame_control) || + is_multicast_ether_addr(hdr->addr1)) goto dont_reorder; /* |