aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:41 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:07 -0400
commit6fef4c0c8eeff7de13007a5f56113475444a253d (patch)
tree216bafb88ab84c5e0a048598cd6c05f7eb8f438d /net/bridge
parentdc1f8bf68b311b1537cb65893430b6796118498a (diff)
netdev: convert pseudo-devices to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_device.c2
-rw-r--r--net/bridge/br_private.h3
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) */
23int br_dev_xmit(struct sk_buff *skb, struct net_device *dev) 23netdev_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 */
145extern void br_dev_setup(struct net_device *dev); 145extern void br_dev_setup(struct net_device *dev);
146extern int br_dev_xmit(struct sk_buff *skb, struct net_device *dev); 146extern 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 */
149extern int br_fdb_init(void); 150extern int br_fdb_init(void);