.. | .. |
---|
116 | 116 | struct sk_buff *skb, |
---|
117 | 117 | struct xlgmac_pkt_info *pkt_info) |
---|
118 | 118 | { |
---|
119 | | - struct skb_frag_struct *frag; |
---|
| 119 | + skb_frag_t *frag; |
---|
120 | 120 | unsigned int context_desc; |
---|
121 | 121 | unsigned int len; |
---|
122 | 122 | unsigned int i; |
---|
.. | .. |
---|
689 | 689 | return 0; |
---|
690 | 690 | } |
---|
691 | 691 | |
---|
692 | | -static void xlgmac_tx_timeout(struct net_device *netdev) |
---|
| 692 | +static void xlgmac_tx_timeout(struct net_device *netdev, unsigned int txqueue) |
---|
693 | 693 | { |
---|
694 | 694 | struct xlgmac_pdata *pdata = netdev_priv(netdev); |
---|
695 | 695 | |
---|
.. | .. |
---|
697 | 697 | schedule_work(&pdata->restart_work); |
---|
698 | 698 | } |
---|
699 | 699 | |
---|
700 | | -static int xlgmac_xmit(struct sk_buff *skb, struct net_device *netdev) |
---|
| 700 | +static netdev_tx_t xlgmac_xmit(struct sk_buff *skb, struct net_device *netdev) |
---|
701 | 701 | { |
---|
702 | 702 | struct xlgmac_pdata *pdata = netdev_priv(netdev); |
---|
703 | 703 | struct xlgmac_pkt_info *tx_pkt_info; |
---|