diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-30 03:50:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-30 03:55:20 -0400 |
| commit | 58717686cf7c7f5a70b3a8907ade8a3ce74306b1 (patch) | |
| tree | 57f5d78524bfd5e65aa9f3943da9c1a3e6ff65b7 /net/mac802154 | |
| parent | cff63a52924c6a78fa525c67d81480c85736ff3c (diff) | |
| parent | 79f632c71bea0d0864d84d6a4ce78da5a9430f5b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/emulex/benet/be.h
include/net/tcp.h
net/mac802154/mac802154.h
Most conflicts were minor overlapping stuff.
The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac802154')
| -rw-r--r-- | net/mac802154/mac802154.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h index 5c9e021994ba..d48422e27110 100644 --- a/net/mac802154/mac802154.h +++ b/net/mac802154/mac802154.h | |||
| @@ -88,7 +88,7 @@ struct mac802154_sub_if_data { | |||
| 88 | 88 | ||
| 89 | #define mac802154_to_priv(_hw) container_of(_hw, struct mac802154_priv, hw) | 89 | #define mac802154_to_priv(_hw) container_of(_hw, struct mac802154_priv, hw) |
| 90 | 90 | ||
| 91 | #define MAC802154_CHAN_NONE (~(u8)0) /* No channel is assigned */ | 91 | #define MAC802154_CHAN_NONE 0xff /* No channel is assigned */ |
| 92 | 92 | ||
| 93 | extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced; | 93 | extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced; |
| 94 | extern struct ieee802154_mlme_ops mac802154_mlme_wpan; | 94 | extern struct ieee802154_mlme_ops mac802154_mlme_wpan; |