.. | .. |
---|
865 | 865 | /** |
---|
866 | 866 | * Start transmission of a packet. |
---|
867 | 867 | * Called from generic network device layer. |
---|
868 | | - * |
---|
869 | | - * skb Pointer to buffer containing the packet. |
---|
870 | | - * dev Pointer to interface struct. |
---|
871 | | - * |
---|
872 | | - * returns 0 if packet consumed, !0 if packet rejected. |
---|
873 | | - * Note: If we return !0, then the packet is free'd by |
---|
874 | | - * the generic network layer. |
---|
875 | 868 | */ |
---|
876 | 869 | /* first merge version - leaving both functions separated */ |
---|
877 | | -static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) |
---|
| 870 | +static netdev_tx_t ctcm_tx(struct sk_buff *skb, struct net_device *dev) |
---|
878 | 871 | { |
---|
879 | 872 | struct ctcm_priv *priv = dev->ml_priv; |
---|
880 | 873 | |
---|
.. | .. |
---|
917 | 910 | } |
---|
918 | 911 | |
---|
919 | 912 | /* unmerged MPC variant of ctcm_tx */ |
---|
920 | | -static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) |
---|
| 913 | +static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) |
---|
921 | 914 | { |
---|
922 | 915 | int len = 0; |
---|
923 | 916 | struct ctcm_priv *priv = dev->ml_priv; |
---|