diff options
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_device.c | 2 | ||||
-rw-r--r-- | net/bridge/br_private.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 15d43ba86b53..07a07770c8b6 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include "br_private.h" | 20 | #include "br_private.h" |
21 | 21 | ||
22 | /* net device transmit always called with no BH (preempt_disabled) */ | 22 | /* net device transmit always called with no BH (preempt_disabled) */ |
23 | int br_dev_xmit(struct sk_buff *skb, struct net_device *dev) | 23 | netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) |
24 | { | 24 | { |
25 | struct net_bridge *br = netdev_priv(dev); | 25 | struct net_bridge *br = netdev_priv(dev); |
26 | const unsigned char *dest = skb->data; | 26 | const unsigned char *dest = skb->data; |
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 8319247dad5d..2114e45682ea 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -143,7 +143,8 @@ static inline int br_is_root_bridge(const struct net_bridge *br) | |||
143 | 143 | ||
144 | /* br_device.c */ | 144 | /* br_device.c */ |
145 | extern void br_dev_setup(struct net_device *dev); | 145 | extern void br_dev_setup(struct net_device *dev); |
146 | extern int br_dev_xmit(struct sk_buff *skb, struct net_device *dev); | 146 | extern netdev_tx_t br_dev_xmit(struct sk_buff *skb, |
147 | struct net_device *dev); | ||
147 | 148 | ||
148 | /* br_fdb.c */ | 149 | /* br_fdb.c */ |
149 | extern int br_fdb_init(void); | 150 | extern int br_fdb_init(void); |