Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbdc8a21 authored by Tonghao Zhang's avatar Tonghao Zhang Committed by David S. Miller
Browse files

bonding: replace the return value type 



The method ndo_start_xmit is defined as returning a
netdev_tx_t, which is a typedef for an enum type,
but the implementation in this driver returns an int.

Signed-off-by: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5db21a3

drivers/net/bonding/bond_alb.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1316,7 +1316,7 @@ void bond_alb_deinitialize(struct bonding *bond) 
		rlb_deinitialize(bond);

		rlb_deinitialize(bond);

}

}





static int bond_do_alb_xmit(struct sk_buff *skb, struct bonding *bond,

static netdev_tx_t bond_do_alb_xmit(struct sk_buff *skb, struct bonding *bond,

				    struct slave *tx_slave)

				    struct slave *tx_slave)

{

{

	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));

	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
@@ -1351,7 +1351,7 @@ static int bond_do_alb_xmit(struct sk_buff *skb, struct bonding *bond, 
	return NETDEV_TX_OK;

	return NETDEV_TX_OK;

}

}





int bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev)

netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev)

{

{

	struct bonding *bond = netdev_priv(bond_dev);

	struct bonding *bond = netdev_priv(bond_dev);

	struct ethhdr *eth_data;

	struct ethhdr *eth_data;
@@ -1389,7 +1389,7 @@ int bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev) 
	return bond_do_alb_xmit(skb, bond, tx_slave);

	return bond_do_alb_xmit(skb, bond, tx_slave);

}

}





int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)

netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)

{

{

	struct bonding *bond = netdev_priv(bond_dev);

	struct bonding *bond = netdev_priv(bond_dev);

	struct ethhdr *eth_data;

	struct ethhdr *eth_data;

drivers/net/bonding/bond_main.c

+8 −4
Original line number Original line Diff line number Diff line
@@ -3805,7 +3805,8 @@ static u32 bond_rr_gen_slave_id(struct bonding *bond) 
	return slave_id;

	return slave_id;

}

}





static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev)

static netdev_tx_t bond_xmit_roundrobin(struct sk_buff *skb,

					struct net_device *bond_dev)

{

{

	struct bonding *bond = netdev_priv(bond_dev);

	struct bonding *bond = netdev_priv(bond_dev);

	struct iphdr *iph = ip_hdr(skb);

	struct iphdr *iph = ip_hdr(skb);
@@ -3841,7 +3842,8 @@ static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev 
/* In active-backup mode, we know that bond->curr_active_slave is always valid if

/* In active-backup mode, we know that bond->curr_active_slave is always valid if

 * the bond has a usable interface.

 * the bond has a usable interface.

 */

 */

static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *bond_dev)

static netdev_tx_t bond_xmit_activebackup(struct sk_buff *skb,

					  struct net_device *bond_dev)

{

{

	struct bonding *bond = netdev_priv(bond_dev);

	struct bonding *bond = netdev_priv(bond_dev);

	struct slave *slave;

	struct slave *slave;
@@ -3979,7 +3981,8 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave) 
 * usable slave array is formed in the control path. The xmit function

 * usable slave array is formed in the control path. The xmit function

 * just calculates hash and sends the packet out.

 * just calculates hash and sends the packet out.

 */

 */

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

static netdev_tx_t bond_3ad_xor_xmit(struct sk_buff *skb,

				     struct net_device *dev)

{

{

	struct bonding *bond = netdev_priv(dev);

	struct bonding *bond = netdev_priv(dev);

	struct slave *slave;

	struct slave *slave;
@@ -3999,7 +4002,8 @@ static int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev) 
}

}





/* in broadcast mode, we send everything to all usable interfaces. */

/* in broadcast mode, we send everything to all usable interfaces. */

static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)

static netdev_tx_t bond_xmit_broadcast(struct sk_buff *skb,

				       struct net_device *bond_dev)

{

{

	struct bonding *bond = netdev_priv(bond_dev);

	struct bonding *bond = netdev_priv(bond_dev);

	struct slave *slave = NULL;

	struct slave *slave = NULL;