diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 16:42:59 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 16:42:59 +0900 |
commit | 9ff561fdf73493d757bbc74aa58627e1381650fb (patch) | |
tree | 4484d230662126b1ac94ea545ca5429c91e0a68b /net/mac802154/tx.c | |
parent | 7b98cf0cf4e8798b9e7435f966ed0d90a2a925de (diff) | |
parent | fdd85ec3eb8cc1b663678a3efa16ee59a32e0277 (diff) | |
download | linux-3.10-9ff561fdf73493d757bbc74aa58627e1381650fb.tar.gz linux-3.10-9ff561fdf73493d757bbc74aa58627e1381650fb.tar.bz2 linux-3.10-9ff561fdf73493d757bbc74aa58627e1381650fb.zip |
Merge branch 'common/pinctrl' into sh-latest
Diffstat (limited to 'net/mac802154/tx.c')
-rw-r--r-- | net/mac802154/tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index 8781d8f904d..434b6873b35 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -83,9 +83,10 @@ 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; + } if (!(priv->hw.flags & IEEE802154_HW_OMIT_CKSUM)) { u16 crc = crc_ccitt(0, skb->data, skb->len); |