diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:07 -0400 |
| commit | 6fef4c0c8eeff7de13007a5f56113475444a253d (patch) | |
| tree | 216bafb88ab84c5e0a048598cd6c05f7eb8f438d /net/dsa | |
| parent | dc1f8bf68b311b1537cb65893430b6796118498a (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/dsa')
| -rw-r--r-- | net/dsa/dsa_priv.h | 6 | ||||
| -rw-r--r-- | net/dsa/tag_dsa.c | 2 | ||||
| -rw-r--r-- | net/dsa/tag_edsa.c | 2 | ||||
| -rw-r--r-- | net/dsa/tag_trailer.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 41055f33d28..4b0ea054044 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h | |||
| @@ -169,13 +169,13 @@ struct net_device *dsa_slave_create(struct dsa_switch *ds, | |||
| 169 | int port, char *name); | 169 | int port, char *name); |
| 170 | 170 | ||
| 171 | /* tag_dsa.c */ | 171 | /* tag_dsa.c */ |
| 172 | int dsa_xmit(struct sk_buff *skb, struct net_device *dev); | 172 | netdev_tx_t dsa_xmit(struct sk_buff *skb, struct net_device *dev); |
| 173 | 173 | ||
| 174 | /* tag_edsa.c */ | 174 | /* tag_edsa.c */ |
| 175 | int edsa_xmit(struct sk_buff *skb, struct net_device *dev); | 175 | netdev_tx_t edsa_xmit(struct sk_buff *skb, struct net_device *dev); |
| 176 | 176 | ||
| 177 | /* tag_trailer.c */ | 177 | /* tag_trailer.c */ |
| 178 | int trailer_xmit(struct sk_buff *skb, struct net_device *dev); | 178 | netdev_tx_t trailer_xmit(struct sk_buff *skb, struct net_device *dev); |
| 179 | 179 | ||
| 180 | 180 | ||
| 181 | #endif | 181 | #endif |
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index 8fa25bafe6c..cdf2d28a029 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #define DSA_HLEN 4 | 16 | #define DSA_HLEN 4 |
| 17 | 17 | ||
| 18 | int dsa_xmit(struct sk_buff *skb, struct net_device *dev) | 18 | netdev_tx_t dsa_xmit(struct sk_buff *skb, struct net_device *dev) |
| 19 | { | 19 | { |
| 20 | struct dsa_slave_priv *p = netdev_priv(dev); | 20 | struct dsa_slave_priv *p = netdev_priv(dev); |
| 21 | u8 *dsa_header; | 21 | u8 *dsa_header; |
diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c index 815607bd286..8f53948cff4 100644 --- a/net/dsa/tag_edsa.c +++ b/net/dsa/tag_edsa.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #define DSA_HLEN 4 | 16 | #define DSA_HLEN 4 |
| 17 | #define EDSA_HLEN 8 | 17 | #define EDSA_HLEN 8 |
| 18 | 18 | ||
| 19 | int edsa_xmit(struct sk_buff *skb, struct net_device *dev) | 19 | netdev_tx_t edsa_xmit(struct sk_buff *skb, struct net_device *dev) |
| 20 | { | 20 | { |
| 21 | struct dsa_slave_priv *p = netdev_priv(dev); | 21 | struct dsa_slave_priv *p = netdev_priv(dev); |
| 22 | u8 *edsa_header; | 22 | u8 *edsa_header; |
diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c index 1c3e30c38b8..a85c829853c 100644 --- a/net/dsa/tag_trailer.c +++ b/net/dsa/tag_trailer.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/netdevice.h> | 13 | #include <linux/netdevice.h> |
| 14 | #include "dsa_priv.h" | 14 | #include "dsa_priv.h" |
| 15 | 15 | ||
| 16 | int trailer_xmit(struct sk_buff *skb, struct net_device *dev) | 16 | netdev_tx_t trailer_xmit(struct sk_buff *skb, struct net_device *dev) |
| 17 | { | 17 | { |
| 18 | struct dsa_slave_priv *p = netdev_priv(dev); | 18 | struct dsa_slave_priv *p = netdev_priv(dev); |
| 19 | struct sk_buff *nskb; | 19 | struct sk_buff *nskb; |
