Commit 6fef4c0c authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

netdev: convert pseudo-devices to netdev_tx_t 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc1f8bf6

drivers/ieee1394/eth1394.c

+4 −10
Original line number Diff line number Diff line
@@ -169,7 +169,8 @@ static int ether1394_header_cache(const struct neighbour *neigh, 
static void ether1394_header_cache_update(struct hh_cache *hh,

					  const struct net_device *dev,

					  const unsigned char *haddr);

static int ether1394_tx(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t ether1394_tx(struct sk_buff *skb,

				struct net_device *dev);

static void ether1394_iso(struct hpsb_iso *iso);



static struct ethtool_ops ethtool_ops;
@@ -1555,7 +1556,8 @@ static void ether1394_complete_cb(void *__ptask) 
}



/* Transmit a packet (called by kernel) */

static int ether1394_tx(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t ether1394_tx(struct sk_buff *skb,

				struct net_device *dev)

{

	struct eth1394hdr hdr_buf;

	struct eth1394_priv *priv = netdev_priv(dev);
@@ -1694,14 +1696,6 @@ static int ether1394_tx(struct sk_buff *skb, struct net_device *dev) 
	dev->stats.tx_errors++;

	spin_unlock_irqrestore(&priv->lock, flags);



	/*

	 * FIXME: According to a patch from 2003-02-26, "returning non-zero

	 * causes serious problems" here, allegedly.  Before that patch,

	 * -ERRNO was returned which is not appropriate under Linux 2.6.

	 * Perhaps more needs to be done?  Stop the queue in serious

	 * conditions and restart it elsewhere?

	 */

	/* return NETDEV_TX_BUSY; */

	return NETDEV_TX_OK;

}

net/8021q/vlan_dev.c

+4 −3
Original line number Diff line number Diff line
@@ -288,7 +288,8 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, 
	return rc;

}



static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,

					    struct net_device *dev)

{

	struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);

	struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);
@@ -325,7 +326,7 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	return NETDEV_TX_OK;

}



static int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,

static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,

						    struct net_device *dev)

{

	struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);

net/bluetooth/bnep/netdev.c

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session 
}

#endif



static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t bnep_net_xmit(struct sk_buff *skb,

				 struct net_device *dev)

{

	struct bnep_session *s = netdev_priv(dev);

	struct sock *sk = s->sock->sk;

net/bridge/br_device.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "br_private.h"



/* net device transmit always called with no BH (preempt_disabled) */

int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)

netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct net_bridge *br = netdev_priv(dev);

	const unsigned char *dest = skb->data;

net/bridge/br_private.h

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ static inline int br_is_root_bridge(const struct net_bridge *br) 


/* br_device.c */

extern void br_dev_setup(struct net_device *dev);

extern int br_dev_xmit(struct sk_buff *skb, struct net_device *dev);

extern netdev_tx_t br_dev_xmit(struct sk_buff *skb,

			       struct net_device *dev);



/* br_fdb.c */

extern int br_fdb_init(void);