diff options
author | David S. Miller <davem@davemloft.net> | 2012-06-29 02:37:00 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-29 02:37:00 +0200 |
commit | b26d344c6b87058ae3e8f919a18580abfc4204eb (patch) | |
tree | ff7026df8e8715e3c63d0ff4ff697a9fac6323fb /net/mac802154/tx.c | |
parent | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (diff) | |
parent | davinci_cpdma: include linux/module.h (diff) | |
download | linux-b26d344c6b87058ae3e8f919a18580abfc4204eb.tar.xz linux-b26d344c6b87058ae3e8f919a18580abfc4204eb.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/caif/caif_hsi.c
drivers/net/usb/qmi_wwan.c
The qmi_wwan merge was trivial.
The caif_hsi.c, on the other hand, was not. It's a conflict between
1c385f1fdf6f9c66d982802cd74349c040980b50 ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19cd0a30be93794aa4773c779c3eb1f3 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.
I did my best with that one and will ask Sjur to check it out.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 86891153dcba..1a4df39c722e 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; + } mac802154_monitors_rx(mac802154_to_priv(&priv->hw), skb); |