diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 09:13:03 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 09:13:03 +0200 |
| commit | fcb06702f023a0e7b1e6ebf9746f34b610ca0508 (patch) | |
| tree | db022324c4978dd9af059be38822d23455a45f55 /net/mac802154/tx.c | |
| parent | wireless: reg: restore previous behaviour of chan->max_power calculations (diff) | |
| parent | bcma: add missing iounmap on error path (diff) | |
| download | linux-fcb06702f023a0e7b1e6ebf9746f34b610ca0508.tar.xz linux-fcb06702f023a0e7b1e6ebf9746f34b610ca0508.zip | |
Merge remote-tracking branch 'wireless/master' into mac80211
Diffstat (limited to 'net/mac802154/tx.c')
| -rw-r--r-- | net/mac802154/tx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index 8781d8f904d9..1a4df39c722e 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -83,9 +83,12 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, { struct xmit_work *work; - if (!(priv->phy->channels_supported[page] & (1 << chan))) + if (!(priv->phy->channels_supported[page] & (1 << chan))) { WARN_ON(1); return NETDEV_TX_OK; + } + + mac802154_monitors_rx(mac802154_to_priv(&priv->hw), skb); if (!(priv->hw.flags & IEEE802154_HW_OMIT_CKSUM)) { u16 crc = crc_ccitt(0, skb->data, skb->len); |