mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
1) Fix regression allowing IP_TTL setting of zero, fix from Cong Wang.
2) Fix leak regressions in tunap, from Jason Wang.
3) be2net driver always returns IRQ_HANDLED in INTx handler, fix from
Sathya Perla.
4) qlge doesn't really support NETIF_F_TSO6, don't set that flag. Fix
from Amerigo Wang.
5) Add 802.11ad Atheros wil6210 driver, from Vladimir Kondratiev.
6) Fix MTU calculations in mac80211 layer, from T Krishna Chaitanya.
7) Station info layer of mac80211 needs to use del_timer_sync(), from
Johannes Berg.
8) tcp_read_sock() can loop forever, because we don't immediately stop
when recv_actor() returns zero. Fix from Eric Dumazet.
9) Fix WARN_ON() in tcp_cleanup_rbuf(). We have to use sk_eat_skb() in
tcp_recv_skb() to handle the case where a large GRO packet is split
up while it is use by a splice() operation. Fix also from Eric
Dumazet.
10) addrconf_get_prefix_route() in ipv6 tests flags incorrectly, it
does:
if (X && (p->flags & Y) != 0)
when it really meant to go:
if (X && (p->flags & X) != 0)
fix from Romain Kuntz.
11) Fix lost Kconfig dependency for bfin_mac driver hardware
timestamping. From Lars-Peter Clausen.
12) Fix regression in handling of RST without ACK in TCP, from Eric
Dumazet.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (37 commits)
be2net: fix unconditionally returning IRQ_HANDLED in INTx
tuntap: fix leaking reference count
tuntap: forbid calling TUNSETIFF when detached
tuntap: switch to use rtnl_dereference()
net, wireless: overwrite default_ethtool_ops
qlge: remove NETIF_F_TSO6 flag
tcp: accept RST without ACK flag
net: ethernet: xilinx: Do not use NO_IRQ in axienet
net: ethernet: xilinx: Do not use axienet on PPC
bnx2x: Allow management traffic after boot from SAN
bnx2x: Fix fastpath structures when memory allocation fails
bfin_mac: Restore hardware time-stamping dependency on BF518
tun: avoid owner checks on IFF_ATTACH_QUEUE
bnx2x: move debugging code before the return
tuntap: refuse to re-attach to different tun_struct
ipv6: use addrconf_get_prefix_route for prefix route lookup [v2]
ipv6: fix the noflags test in addrconf_get_prefix_route
tcp: fix splice() and tcp collapsing interaction
tcp: splice: fix an infinite loop in tcp_read_sock()
net: prevent setting ttl=0 via IP_TTL
...
This commit is contained in:
Linus Torvalds
commit
6843cc0e0f
56 changed files with 6654 additions and 199 deletions
|
|
@ -6121,6 +6121,14 @@ struct netdev_queue *dev_ingress_queue_create(struct net_device *dev)
|
|||
|
||||
static const struct ethtool_ops default_ethtool_ops;
|
||||
|
||||
void netdev_set_default_ethtool_ops(struct net_device *dev,
|
||||
const struct ethtool_ops *ops)
|
||||
{
|
||||
if (dev->ethtool_ops == &default_ethtool_ops)
|
||||
dev->ethtool_ops = ops;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(netdev_set_default_ethtool_ops);
|
||||
|
||||
/**
|
||||
* alloc_netdev_mqs - allocate network device
|
||||
* @sizeof_priv: size of private data to allocate space for
|
||||
|
|
|
|||
|
|
@ -590,7 +590,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
|
|||
case IP_TTL:
|
||||
if (optlen < 1)
|
||||
goto e_inval;
|
||||
if (val != -1 && (val < 0 || val > 255))
|
||||
if (val != -1 && (val < 1 || val > 255))
|
||||
goto e_inval;
|
||||
inet->uc_ttl = val;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -1428,12 +1428,12 @@ static void tcp_service_net_dma(struct sock *sk, bool wait)
|
|||
}
|
||||
#endif
|
||||
|
||||
static inline struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off)
|
||||
static struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
u32 offset;
|
||||
|
||||
skb_queue_walk(&sk->sk_receive_queue, skb) {
|
||||
while ((skb = skb_peek(&sk->sk_receive_queue)) != NULL) {
|
||||
offset = seq - TCP_SKB_CB(skb)->seq;
|
||||
if (tcp_hdr(skb)->syn)
|
||||
offset--;
|
||||
|
|
@ -1441,6 +1441,11 @@ static inline struct sk_buff *tcp_recv_skb(struct sock *sk, u32 seq, u32 *off)
|
|||
*off = offset;
|
||||
return skb;
|
||||
}
|
||||
/* This looks weird, but this can happen if TCP collapsing
|
||||
* splitted a fat GRO packet, while we released socket lock
|
||||
* in skb_splice_bits()
|
||||
*/
|
||||
sk_eat_skb(sk, skb, false);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -1482,7 +1487,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
|
|||
break;
|
||||
}
|
||||
used = recv_actor(desc, skb, offset, len);
|
||||
if (used < 0) {
|
||||
if (used <= 0) {
|
||||
if (!copied)
|
||||
copied = used;
|
||||
break;
|
||||
|
|
@ -1520,8 +1525,10 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
|
|||
tcp_rcv_space_adjust(sk);
|
||||
|
||||
/* Clean up data we have read: This will do ACK frames. */
|
||||
if (copied > 0)
|
||||
if (copied > 0) {
|
||||
tcp_recv_skb(sk, seq, &offset);
|
||||
tcp_cleanup_rbuf(sk, copied);
|
||||
}
|
||||
return copied;
|
||||
}
|
||||
EXPORT_SYMBOL(tcp_read_sock);
|
||||
|
|
|
|||
|
|
@ -5543,7 +5543,7 @@ slow_path:
|
|||
if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb))
|
||||
goto csum_error;
|
||||
|
||||
if (!th->ack)
|
||||
if (!th->ack && !th->rst)
|
||||
goto discard;
|
||||
|
||||
/*
|
||||
|
|
@ -5988,7 +5988,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
|
|||
goto discard;
|
||||
}
|
||||
|
||||
if (!th->ack)
|
||||
if (!th->ack && !th->rst)
|
||||
goto discard;
|
||||
|
||||
if (!tcp_validate_incoming(sk, skb, th, 0))
|
||||
|
|
|
|||
|
|
@ -154,6 +154,11 @@ static void addrconf_type_change(struct net_device *dev,
|
|||
unsigned long event);
|
||||
static int addrconf_ifdown(struct net_device *dev, int how);
|
||||
|
||||
static struct rt6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,
|
||||
int plen,
|
||||
const struct net_device *dev,
|
||||
u32 flags, u32 noflags);
|
||||
|
||||
static void addrconf_dad_start(struct inet6_ifaddr *ifp);
|
||||
static void addrconf_dad_timer(unsigned long data);
|
||||
static void addrconf_dad_completed(struct inet6_ifaddr *ifp);
|
||||
|
|
@ -250,12 +255,6 @@ static inline bool addrconf_qdisc_ok(const struct net_device *dev)
|
|||
return !qdisc_tx_is_noop(dev);
|
||||
}
|
||||
|
||||
/* Check if a route is valid prefix route */
|
||||
static inline int addrconf_is_prefix_route(const struct rt6_info *rt)
|
||||
{
|
||||
return (rt->rt6i_flags & (RTF_GATEWAY | RTF_DEFAULT)) == 0;
|
||||
}
|
||||
|
||||
static void addrconf_del_timer(struct inet6_ifaddr *ifp)
|
||||
{
|
||||
if (del_timer(&ifp->timer))
|
||||
|
|
@ -941,17 +940,15 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)
|
|||
if ((ifp->flags & IFA_F_PERMANENT) && onlink < 1) {
|
||||
struct in6_addr prefix;
|
||||
struct rt6_info *rt;
|
||||
struct net *net = dev_net(ifp->idev->dev);
|
||||
struct flowi6 fl6 = {};
|
||||
|
||||
ipv6_addr_prefix(&prefix, &ifp->addr, ifp->prefix_len);
|
||||
fl6.flowi6_oif = ifp->idev->dev->ifindex;
|
||||
fl6.daddr = prefix;
|
||||
rt = (struct rt6_info *)ip6_route_lookup(net, &fl6,
|
||||
RT6_LOOKUP_F_IFACE);
|
||||
|
||||
if (rt != net->ipv6.ip6_null_entry &&
|
||||
addrconf_is_prefix_route(rt)) {
|
||||
rt = addrconf_get_prefix_route(&prefix,
|
||||
ifp->prefix_len,
|
||||
ifp->idev->dev,
|
||||
0, RTF_GATEWAY | RTF_DEFAULT);
|
||||
|
||||
if (rt) {
|
||||
if (onlink == 0) {
|
||||
ip6_del_rt(rt);
|
||||
rt = NULL;
|
||||
|
|
@ -1877,7 +1874,7 @@ static struct rt6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,
|
|||
continue;
|
||||
if ((rt->rt6i_flags & flags) != flags)
|
||||
continue;
|
||||
if ((noflags != 0) && ((rt->rt6i_flags & flags) != 0))
|
||||
if ((rt->rt6i_flags & noflags) != 0)
|
||||
continue;
|
||||
dst_hold(&rt->dst);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -1009,6 +1009,8 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
|
|||
if (old_probe_resp)
|
||||
kfree_rcu(old_probe_resp, rcu_head);
|
||||
|
||||
list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
|
||||
sta_info_flush(local, vlan);
|
||||
sta_info_flush(local, sdata);
|
||||
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
#include <linux/nl80211.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
#include <net/cfg80211.h>
|
||||
#include "ieee80211_i.h"
|
||||
#include "driver-ops.h"
|
||||
|
|
@ -197,6 +198,15 @@ static void __ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata)
|
|||
|
||||
ctx = container_of(conf, struct ieee80211_chanctx, conf);
|
||||
|
||||
if (sdata->vif.type == NL80211_IFTYPE_AP) {
|
||||
struct ieee80211_sub_if_data *vlan;
|
||||
|
||||
/* for the VLAN list */
|
||||
ASSERT_RTNL();
|
||||
list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
|
||||
rcu_assign_pointer(vlan->vif.chanctx_conf, NULL);
|
||||
}
|
||||
|
||||
ieee80211_unassign_vif_chanctx(sdata, ctx);
|
||||
if (ctx->refcount == 0)
|
||||
ieee80211_free_chanctx(local, ctx);
|
||||
|
|
@ -316,6 +326,15 @@ int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,
|
|||
goto out;
|
||||
}
|
||||
|
||||
if (sdata->vif.type == NL80211_IFTYPE_AP) {
|
||||
struct ieee80211_sub_if_data *vlan;
|
||||
|
||||
/* for the VLAN list */
|
||||
ASSERT_RTNL();
|
||||
list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
|
||||
rcu_assign_pointer(vlan->vif.chanctx_conf, &ctx->conf);
|
||||
}
|
||||
|
||||
ieee80211_recalc_smps_chanctx(local, ctx);
|
||||
out:
|
||||
mutex_unlock(&local->chanctx_mtx);
|
||||
|
|
@ -331,6 +350,25 @@ void ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata)
|
|||
mutex_unlock(&sdata->local->chanctx_mtx);
|
||||
}
|
||||
|
||||
void ieee80211_vif_vlan_copy_chanctx(struct ieee80211_sub_if_data *sdata)
|
||||
{
|
||||
struct ieee80211_local *local = sdata->local;
|
||||
struct ieee80211_sub_if_data *ap;
|
||||
struct ieee80211_chanctx_conf *conf;
|
||||
|
||||
if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_AP_VLAN || !sdata->bss))
|
||||
return;
|
||||
|
||||
ap = container_of(sdata->bss, struct ieee80211_sub_if_data, u.ap);
|
||||
|
||||
mutex_lock(&local->chanctx_mtx);
|
||||
|
||||
conf = rcu_dereference_protected(ap->vif.chanctx_conf,
|
||||
lockdep_is_held(&local->chanctx_mtx));
|
||||
rcu_assign_pointer(sdata->vif.chanctx_conf, conf);
|
||||
mutex_unlock(&local->chanctx_mtx);
|
||||
}
|
||||
|
||||
void ieee80211_iter_chan_contexts_atomic(
|
||||
struct ieee80211_hw *hw,
|
||||
void (*iter)(struct ieee80211_hw *hw,
|
||||
|
|
|
|||
|
|
@ -703,8 +703,8 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
|
|||
sdata_info(sdata,
|
||||
"No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n");
|
||||
|
||||
ieee80211_request_internal_scan(sdata,
|
||||
ifibss->ssid, ifibss->ssid_len, NULL);
|
||||
ieee80211_request_ibss_scan(sdata, ifibss->ssid, ifibss->ssid_len,
|
||||
NULL);
|
||||
}
|
||||
|
||||
static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
|
||||
|
|
@ -802,9 +802,8 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
|
|||
IEEE80211_SCAN_INTERVAL)) {
|
||||
sdata_info(sdata, "Trigger new scan to find an IBSS to join\n");
|
||||
|
||||
ieee80211_request_internal_scan(sdata,
|
||||
ifibss->ssid, ifibss->ssid_len,
|
||||
ifibss->fixed_channel ? ifibss->channel : NULL);
|
||||
ieee80211_request_ibss_scan(sdata, ifibss->ssid,
|
||||
ifibss->ssid_len, chan);
|
||||
} else {
|
||||
int interval = IEEE80211_SCAN_INTERVAL;
|
||||
|
||||
|
|
|
|||
|
|
@ -92,8 +92,6 @@ struct ieee80211_bss {
|
|||
|
||||
u32 device_ts;
|
||||
|
||||
u8 dtim_period;
|
||||
|
||||
bool wmm_used;
|
||||
bool uapsd_supported;
|
||||
|
||||
|
|
@ -140,7 +138,6 @@ enum ieee80211_bss_corrupt_data_flags {
|
|||
|
||||
/**
|
||||
* enum ieee80211_valid_data_flags - BSS valid data flags
|
||||
* @IEEE80211_BSS_VALID_DTIM: DTIM data was gathered from non-corrupt IE
|
||||
* @IEEE80211_BSS_VALID_WMM: WMM/UAPSD data was gathered from non-corrupt IE
|
||||
* @IEEE80211_BSS_VALID_RATES: Supported rates were gathered from non-corrupt IE
|
||||
* @IEEE80211_BSS_VALID_ERP: ERP flag was gathered from non-corrupt IE
|
||||
|
|
@ -151,7 +148,6 @@ enum ieee80211_bss_corrupt_data_flags {
|
|||
* beacon/probe response.
|
||||
*/
|
||||
enum ieee80211_bss_valid_data_flags {
|
||||
IEEE80211_BSS_VALID_DTIM = BIT(0),
|
||||
IEEE80211_BSS_VALID_WMM = BIT(1),
|
||||
IEEE80211_BSS_VALID_RATES = BIT(2),
|
||||
IEEE80211_BSS_VALID_ERP = BIT(3)
|
||||
|
|
@ -440,6 +436,7 @@ struct ieee80211_if_managed {
|
|||
unsigned long timers_running; /* used for quiesce/restart */
|
||||
bool powersave; /* powersave requested for this iface */
|
||||
bool broken_ap; /* AP is broken -- turn off powersave */
|
||||
u8 dtim_period;
|
||||
enum ieee80211_smps_mode req_smps, /* requested smps mode */
|
||||
driver_smps_mode; /* smps mode request */
|
||||
|
||||
|
|
@ -773,6 +770,10 @@ struct ieee80211_sub_if_data {
|
|||
u32 mntr_flags;
|
||||
} u;
|
||||
|
||||
spinlock_t cleanup_stations_lock;
|
||||
struct list_head cleanup_stations;
|
||||
struct work_struct cleanup_stations_wk;
|
||||
|
||||
#ifdef CONFIG_MAC80211_DEBUGFS
|
||||
struct {
|
||||
struct dentry *dir;
|
||||
|
|
@ -1329,9 +1330,9 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
|
|||
|
||||
/* scan/BSS handling */
|
||||
void ieee80211_scan_work(struct work_struct *work);
|
||||
int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
|
||||
const u8 *ssid, u8 ssid_len,
|
||||
struct ieee80211_channel *chan);
|
||||
int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata,
|
||||
const u8 *ssid, u8 ssid_len,
|
||||
struct ieee80211_channel *chan);
|
||||
int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata,
|
||||
struct cfg80211_scan_request *req);
|
||||
void ieee80211_scan_cancel(struct ieee80211_local *local);
|
||||
|
|
@ -1628,6 +1629,7 @@ ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,
|
|||
const struct cfg80211_chan_def *chandef,
|
||||
enum ieee80211_chanctx_mode mode);
|
||||
void ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata);
|
||||
void ieee80211_vif_vlan_copy_chanctx(struct ieee80211_sub_if_data *sdata);
|
||||
|
||||
void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,
|
||||
struct ieee80211_chanctx *chanctx);
|
||||
|
|
|
|||
|
|
@ -207,17 +207,8 @@ void ieee80211_recalc_idle(struct ieee80211_local *local)
|
|||
|
||||
static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
|
||||
{
|
||||
int meshhdrlen;
|
||||
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
||||
|
||||
meshhdrlen = (sdata->vif.type == NL80211_IFTYPE_MESH_POINT) ? 5 : 0;
|
||||
|
||||
/* FIX: what would be proper limits for MTU?
|
||||
* This interface uses 802.3 frames. */
|
||||
if (new_mtu < 256 ||
|
||||
new_mtu > IEEE80211_MAX_DATA_LEN - 24 - 6 - meshhdrlen) {
|
||||
if (new_mtu < 256 || new_mtu > IEEE80211_MAX_DATA_LEN)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
dev->mtu = new_mtu;
|
||||
return 0;
|
||||
|
|
@ -586,11 +577,13 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
|
|||
|
||||
switch (sdata->vif.type) {
|
||||
case NL80211_IFTYPE_AP_VLAN:
|
||||
/* no need to tell driver, but set carrier */
|
||||
if (rtnl_dereference(sdata->bss->beacon))
|
||||
/* no need to tell driver, but set carrier and chanctx */
|
||||
if (rtnl_dereference(sdata->bss->beacon)) {
|
||||
ieee80211_vif_vlan_copy_chanctx(sdata);
|
||||
netif_carrier_on(dev);
|
||||
else
|
||||
} else {
|
||||
netif_carrier_off(dev);
|
||||
}
|
||||
break;
|
||||
case NL80211_IFTYPE_MONITOR:
|
||||
if (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) {
|
||||
|
|
@ -839,6 +832,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
|
|||
switch (sdata->vif.type) {
|
||||
case NL80211_IFTYPE_AP_VLAN:
|
||||
list_del(&sdata->u.vlan.list);
|
||||
rcu_assign_pointer(sdata->vif.chanctx_conf, NULL);
|
||||
/* no need to tell driver */
|
||||
break;
|
||||
case NL80211_IFTYPE_MONITOR:
|
||||
|
|
@ -865,20 +859,11 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
|
|||
cancel_work_sync(&sdata->work);
|
||||
/*
|
||||
* When we get here, the interface is marked down.
|
||||
* Call rcu_barrier() to wait both for the RX path
|
||||
* Call synchronize_rcu() to wait for the RX path
|
||||
* should it be using the interface and enqueuing
|
||||
* frames at this very time on another CPU, and
|
||||
* for the sta free call_rcu callbacks.
|
||||
* frames at this very time on another CPU.
|
||||
*/
|
||||
rcu_barrier();
|
||||
|
||||
/*
|
||||
* free_sta_rcu() enqueues a work for the actual
|
||||
* sta cleanup, so we need to flush it while
|
||||
* sdata is still valid.
|
||||
*/
|
||||
flush_workqueue(local->workqueue);
|
||||
|
||||
synchronize_rcu();
|
||||
skb_queue_purge(&sdata->skb_queue);
|
||||
|
||||
/*
|
||||
|
|
@ -1498,6 +1483,15 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local,
|
|||
mutex_unlock(&local->iflist_mtx);
|
||||
}
|
||||
|
||||
static void ieee80211_cleanup_sdata_stas_wk(struct work_struct *wk)
|
||||
{
|
||||
struct ieee80211_sub_if_data *sdata;
|
||||
|
||||
sdata = container_of(wk, struct ieee80211_sub_if_data, cleanup_stations_wk);
|
||||
|
||||
ieee80211_cleanup_sdata_stas(sdata);
|
||||
}
|
||||
|
||||
int ieee80211_if_add(struct ieee80211_local *local, const char *name,
|
||||
struct wireless_dev **new_wdev, enum nl80211_iftype type,
|
||||
struct vif_params *params)
|
||||
|
|
@ -1573,6 +1567,10 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
|
|||
|
||||
INIT_LIST_HEAD(&sdata->key_list);
|
||||
|
||||
spin_lock_init(&sdata->cleanup_stations_lock);
|
||||
INIT_LIST_HEAD(&sdata->cleanup_stations);
|
||||
INIT_WORK(&sdata->cleanup_stations_wk, ieee80211_cleanup_sdata_stas_wk);
|
||||
|
||||
for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
|
||||
struct ieee80211_supported_band *sband;
|
||||
sband = local->hw.wiphy->bands[i];
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ int mesh_rmc_init(struct ieee80211_sub_if_data *sdata)
|
|||
return -ENOMEM;
|
||||
sdata->u.mesh.rmc->idx_mask = RMC_BUCKETS - 1;
|
||||
for (i = 0; i < RMC_BUCKETS; i++)
|
||||
INIT_LIST_HEAD(&sdata->u.mesh.rmc->bucket[i].list);
|
||||
INIT_LIST_HEAD(&sdata->u.mesh.rmc->bucket[i]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -177,7 +177,7 @@ void mesh_rmc_free(struct ieee80211_sub_if_data *sdata)
|
|||
return;
|
||||
|
||||
for (i = 0; i < RMC_BUCKETS; i++)
|
||||
list_for_each_entry_safe(p, n, &rmc->bucket[i].list, list) {
|
||||
list_for_each_entry_safe(p, n, &rmc->bucket[i], list) {
|
||||
list_del(&p->list);
|
||||
kmem_cache_free(rm_cache, p);
|
||||
}
|
||||
|
|
@ -210,7 +210,7 @@ int mesh_rmc_check(u8 *sa, struct ieee80211s_hdr *mesh_hdr,
|
|||
/* Don't care about endianness since only match matters */
|
||||
memcpy(&seqnum, &mesh_hdr->seqnum, sizeof(mesh_hdr->seqnum));
|
||||
idx = le32_to_cpu(mesh_hdr->seqnum) & rmc->idx_mask;
|
||||
list_for_each_entry_safe(p, n, &rmc->bucket[idx].list, list) {
|
||||
list_for_each_entry_safe(p, n, &rmc->bucket[idx], list) {
|
||||
++entries;
|
||||
if (time_after(jiffies, p->exp_time) ||
|
||||
(entries == RMC_QUEUE_MAX_LEN)) {
|
||||
|
|
@ -229,7 +229,7 @@ int mesh_rmc_check(u8 *sa, struct ieee80211s_hdr *mesh_hdr,
|
|||
p->seqnum = seqnum;
|
||||
p->exp_time = jiffies + RMC_TIMEOUT;
|
||||
memcpy(p->sa, sa, ETH_ALEN);
|
||||
list_add(&p->list, &rmc->bucket[idx].list);
|
||||
list_add(&p->list, &rmc->bucket[idx]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ struct rmc_entry {
|
|||
};
|
||||
|
||||
struct mesh_rmc {
|
||||
struct rmc_entry bucket[RMC_BUCKETS];
|
||||
struct list_head bucket[RMC_BUCKETS];
|
||||
u32 idx_mask;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1074,12 +1074,8 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
|
|||
if (beaconint_us > latency) {
|
||||
local->ps_sdata = NULL;
|
||||
} else {
|
||||
struct ieee80211_bss *bss;
|
||||
int maxslp = 1;
|
||||
u8 dtimper;
|
||||
|
||||
bss = (void *)found->u.mgd.associated->priv;
|
||||
dtimper = bss->dtim_period;
|
||||
u8 dtimper = found->u.mgd.dtim_period;
|
||||
|
||||
/* If the TIM IE is invalid, pretend the value is 1 */
|
||||
if (!dtimper)
|
||||
|
|
@ -1410,10 +1406,17 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
|
|||
|
||||
ieee80211_led_assoc(local, 1);
|
||||
|
||||
if (local->hw.flags & IEEE80211_HW_NEED_DTIM_PERIOD)
|
||||
bss_conf->dtim_period = bss->dtim_period;
|
||||
else
|
||||
if (local->hw.flags & IEEE80211_HW_NEED_DTIM_PERIOD) {
|
||||
/*
|
||||
* If the AP is buggy we may get here with no DTIM period
|
||||
* known, so assume it's 1 which is the only safe assumption
|
||||
* in that case, although if the TIM IE is broken powersave
|
||||
* probably just won't work at all.
|
||||
*/
|
||||
bss_conf->dtim_period = sdata->u.mgd.dtim_period ?: 1;
|
||||
} else {
|
||||
bss_conf->dtim_period = 0;
|
||||
}
|
||||
|
||||
bss_conf->assoc = 1;
|
||||
|
||||
|
|
@ -1562,6 +1565,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
|
|||
|
||||
sdata->u.mgd.timers_running = 0;
|
||||
|
||||
sdata->vif.bss_conf.dtim_period = 0;
|
||||
|
||||
ifmgd->flags = 0;
|
||||
ieee80211_vif_release_channel(sdata);
|
||||
}
|
||||
|
|
@ -2373,11 +2378,18 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
|
|||
struct ieee80211_channel *channel;
|
||||
bool need_ps = false;
|
||||
|
||||
if (sdata->u.mgd.associated &&
|
||||
ether_addr_equal(mgmt->bssid, sdata->u.mgd.associated->bssid)) {
|
||||
bss = (void *)sdata->u.mgd.associated->priv;
|
||||
if ((sdata->u.mgd.associated &&
|
||||
ether_addr_equal(mgmt->bssid, sdata->u.mgd.associated->bssid)) ||
|
||||
(sdata->u.mgd.assoc_data &&
|
||||
ether_addr_equal(mgmt->bssid,
|
||||
sdata->u.mgd.assoc_data->bss->bssid))) {
|
||||
/* not previously set so we may need to recalc */
|
||||
need_ps = !bss->dtim_period;
|
||||
need_ps = sdata->u.mgd.associated && !sdata->u.mgd.dtim_period;
|
||||
|
||||
if (elems->tim && !elems->parse_error) {
|
||||
struct ieee80211_tim_ie *tim_ie = elems->tim;
|
||||
sdata->u.mgd.dtim_period = tim_ie->dtim_period;
|
||||
}
|
||||
}
|
||||
|
||||
if (elems->ds_params && elems->ds_params_len == 1)
|
||||
|
|
@ -3896,20 +3908,41 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
|
|||
/* kick off associate process */
|
||||
|
||||
ifmgd->assoc_data = assoc_data;
|
||||
ifmgd->dtim_period = 0;
|
||||
|
||||
err = ieee80211_prep_connection(sdata, req->bss, true);
|
||||
if (err)
|
||||
goto err_clear;
|
||||
|
||||
if (!bss->dtim_period &&
|
||||
sdata->local->hw.flags & IEEE80211_HW_NEED_DTIM_PERIOD) {
|
||||
/*
|
||||
* Wait up to one beacon interval ...
|
||||
* should this be more if we miss one?
|
||||
*/
|
||||
sdata_info(sdata, "waiting for beacon from %pM\n",
|
||||
ifmgd->bssid);
|
||||
assoc_data->timeout = TU_TO_EXP_TIME(req->bss->beacon_interval);
|
||||
if (sdata->local->hw.flags & IEEE80211_HW_NEED_DTIM_PERIOD) {
|
||||
const struct cfg80211_bss_ies *beacon_ies;
|
||||
|
||||
rcu_read_lock();
|
||||
beacon_ies = rcu_dereference(req->bss->beacon_ies);
|
||||
if (!beacon_ies) {
|
||||
/*
|
||||
* Wait up to one beacon interval ...
|
||||
* should this be more if we miss one?
|
||||
*/
|
||||
sdata_info(sdata, "waiting for beacon from %pM\n",
|
||||
ifmgd->bssid);
|
||||
assoc_data->timeout =
|
||||
TU_TO_EXP_TIME(req->bss->beacon_interval);
|
||||
} else {
|
||||
const u8 *tim_ie = cfg80211_find_ie(WLAN_EID_TIM,
|
||||
beacon_ies->data,
|
||||
beacon_ies->len);
|
||||
if (tim_ie && tim_ie[1] >=
|
||||
sizeof(struct ieee80211_tim_ie)) {
|
||||
const struct ieee80211_tim_ie *tim;
|
||||
tim = (void *)(tim_ie + 2);
|
||||
ifmgd->dtim_period = tim->dtim_period;
|
||||
}
|
||||
assoc_data->have_beacon = true;
|
||||
assoc_data->sent_assoc = false;
|
||||
assoc_data->timeout = jiffies;
|
||||
}
|
||||
rcu_read_unlock();
|
||||
} else {
|
||||
assoc_data->have_beacon = true;
|
||||
assoc_data->sent_assoc = false;
|
||||
|
|
|
|||
|
|
@ -113,18 +113,6 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
|
|||
bss->valid_data |= IEEE80211_BSS_VALID_ERP;
|
||||
}
|
||||
|
||||
if (elems->tim && (!elems->parse_error ||
|
||||
!(bss->valid_data & IEEE80211_BSS_VALID_DTIM))) {
|
||||
struct ieee80211_tim_ie *tim_ie = elems->tim;
|
||||
bss->dtim_period = tim_ie->dtim_period;
|
||||
if (!elems->parse_error)
|
||||
bss->valid_data |= IEEE80211_BSS_VALID_DTIM;
|
||||
}
|
||||
|
||||
/* If the beacon had no TIM IE, or it was invalid, use 1 */
|
||||
if (beacon && !bss->dtim_period)
|
||||
bss->dtim_period = 1;
|
||||
|
||||
/* replace old supported rates if we get new values */
|
||||
if (!elems->parse_error ||
|
||||
!(bss->valid_data & IEEE80211_BSS_VALID_RATES)) {
|
||||
|
|
@ -832,9 +820,9 @@ int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata,
|
|||
return res;
|
||||
}
|
||||
|
||||
int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
|
||||
const u8 *ssid, u8 ssid_len,
|
||||
struct ieee80211_channel *chan)
|
||||
int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata,
|
||||
const u8 *ssid, u8 ssid_len,
|
||||
struct ieee80211_channel *chan)
|
||||
{
|
||||
struct ieee80211_local *local = sdata->local;
|
||||
int ret = -EBUSY;
|
||||
|
|
@ -848,22 +836,36 @@ int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
|
|||
|
||||
/* fill internal scan request */
|
||||
if (!chan) {
|
||||
int i, nchan = 0;
|
||||
int i, max_n;
|
||||
int n_ch = 0;
|
||||
|
||||
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
|
||||
if (!local->hw.wiphy->bands[band])
|
||||
continue;
|
||||
for (i = 0;
|
||||
i < local->hw.wiphy->bands[band]->n_channels;
|
||||
i++) {
|
||||
local->int_scan_req->channels[nchan] =
|
||||
|
||||
max_n = local->hw.wiphy->bands[band]->n_channels;
|
||||
for (i = 0; i < max_n; i++) {
|
||||
struct ieee80211_channel *tmp_ch =
|
||||
&local->hw.wiphy->bands[band]->channels[i];
|
||||
nchan++;
|
||||
|
||||
if (tmp_ch->flags & (IEEE80211_CHAN_NO_IBSS |
|
||||
IEEE80211_CHAN_DISABLED))
|
||||
continue;
|
||||
|
||||
local->int_scan_req->channels[n_ch] = tmp_ch;
|
||||
n_ch++;
|
||||
}
|
||||
}
|
||||
|
||||
local->int_scan_req->n_channels = nchan;
|
||||
if (WARN_ON_ONCE(n_ch == 0))
|
||||
goto unlock;
|
||||
|
||||
local->int_scan_req->n_channels = n_ch;
|
||||
} else {
|
||||
if (WARN_ON_ONCE(chan->flags & (IEEE80211_CHAN_NO_IBSS |
|
||||
IEEE80211_CHAN_DISABLED)))
|
||||
goto unlock;
|
||||
|
||||
local->int_scan_req->channels[0] = chan;
|
||||
local->int_scan_req->n_channels = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,9 +91,8 @@ static int sta_info_hash_del(struct ieee80211_local *local,
|
|||
return -ENOENT;
|
||||
}
|
||||
|
||||
static void free_sta_work(struct work_struct *wk)
|
||||
static void cleanup_single_sta(struct sta_info *sta)
|
||||
{
|
||||
struct sta_info *sta = container_of(wk, struct sta_info, free_sta_wk);
|
||||
int ac, i;
|
||||
struct tid_ampdu_tx *tid_tx;
|
||||
struct ieee80211_sub_if_data *sdata = sta->sdata;
|
||||
|
|
@ -153,11 +152,35 @@ static void free_sta_work(struct work_struct *wk)
|
|||
sta_info_free(local, sta);
|
||||
}
|
||||
|
||||
void ieee80211_cleanup_sdata_stas(struct ieee80211_sub_if_data *sdata)
|
||||
{
|
||||
struct sta_info *sta;
|
||||
|
||||
spin_lock_bh(&sdata->cleanup_stations_lock);
|
||||
while (!list_empty(&sdata->cleanup_stations)) {
|
||||
sta = list_first_entry(&sdata->cleanup_stations,
|
||||
struct sta_info, list);
|
||||
list_del(&sta->list);
|
||||
spin_unlock_bh(&sdata->cleanup_stations_lock);
|
||||
|
||||
cleanup_single_sta(sta);
|
||||
|
||||
spin_lock_bh(&sdata->cleanup_stations_lock);
|
||||
}
|
||||
|
||||
spin_unlock_bh(&sdata->cleanup_stations_lock);
|
||||
}
|
||||
|
||||
static void free_sta_rcu(struct rcu_head *h)
|
||||
{
|
||||
struct sta_info *sta = container_of(h, struct sta_info, rcu_head);
|
||||
struct ieee80211_sub_if_data *sdata = sta->sdata;
|
||||
|
||||
ieee80211_queue_work(&sta->local->hw, &sta->free_sta_wk);
|
||||
spin_lock(&sdata->cleanup_stations_lock);
|
||||
list_add_tail(&sta->list, &sdata->cleanup_stations);
|
||||
spin_unlock(&sdata->cleanup_stations_lock);
|
||||
|
||||
ieee80211_queue_work(&sdata->local->hw, &sdata->cleanup_stations_wk);
|
||||
}
|
||||
|
||||
/* protected by RCU */
|
||||
|
|
@ -310,7 +333,6 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
|
|||
|
||||
spin_lock_init(&sta->lock);
|
||||
INIT_WORK(&sta->drv_unblock_wk, sta_unblock);
|
||||
INIT_WORK(&sta->free_sta_wk, free_sta_work);
|
||||
INIT_WORK(&sta->ampdu_mlme.work, ieee80211_ba_session_work);
|
||||
mutex_init(&sta->ampdu_mlme.mtx);
|
||||
|
||||
|
|
@ -862,7 +884,7 @@ void sta_info_init(struct ieee80211_local *local)
|
|||
|
||||
void sta_info_stop(struct ieee80211_local *local)
|
||||
{
|
||||
del_timer(&local->sta_cleanup);
|
||||
del_timer_sync(&local->sta_cleanup);
|
||||
sta_info_flush(local, NULL);
|
||||
}
|
||||
|
||||
|
|
@ -891,6 +913,20 @@ int sta_info_flush(struct ieee80211_local *local,
|
|||
}
|
||||
mutex_unlock(&local->sta_mtx);
|
||||
|
||||
rcu_barrier();
|
||||
|
||||
if (sdata) {
|
||||
ieee80211_cleanup_sdata_stas(sdata);
|
||||
cancel_work_sync(&sdata->cleanup_stations_wk);
|
||||
} else {
|
||||
mutex_lock(&local->iflist_mtx);
|
||||
list_for_each_entry(sdata, &local->interfaces, list) {
|
||||
ieee80211_cleanup_sdata_stas(sdata);
|
||||
cancel_work_sync(&sdata->cleanup_stations_wk);
|
||||
}
|
||||
mutex_unlock(&local->iflist_mtx);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -299,7 +299,6 @@ struct sta_info {
|
|||
spinlock_t lock;
|
||||
|
||||
struct work_struct drv_unblock_wk;
|
||||
struct work_struct free_sta_wk;
|
||||
|
||||
u16 listen_interval;
|
||||
|
||||
|
|
@ -563,4 +562,6 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta);
|
|||
void ieee80211_sta_ps_deliver_poll_response(struct sta_info *sta);
|
||||
void ieee80211_sta_ps_deliver_uapsd(struct sta_info *sta);
|
||||
|
||||
void ieee80211_cleanup_sdata_stas(struct ieee80211_sub_if_data *sdata);
|
||||
|
||||
#endif /* STA_INFO_H */
|
||||
|
|
|
|||
|
|
@ -866,8 +866,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
|
|||
/* allow mac80211 to determine the timeout */
|
||||
wdev->ps_timeout = -1;
|
||||
|
||||
if (!dev->ethtool_ops)
|
||||
dev->ethtool_ops = &cfg80211_ethtool_ops;
|
||||
netdev_set_default_ethtool_ops(dev, &cfg80211_ethtool_ops);
|
||||
|
||||
if ((wdev->iftype == NL80211_IFTYPE_STATION ||
|
||||
wdev->iftype == NL80211_IFTYPE_P2P_CLIENT ||
|
||||
|
|
|
|||
Loading…
Reference in a new issue