Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8b62ff2dbc3d6c13997b9d440dfd0ed00e6df96d

Authored by Stephen Hemminger
Committed by David S. Miller
1 parent 36e4d64a82

isdn: convert to netdev_tx_t 

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 4 additions and 3 deletions Side-by-side Diff

drivers/isdn/hysdn/hysdn_net.c
Diff comments   View file @ 8b62ff2
... ... @@ -119,7 +119,7 @@
119 119 /* send a packet on this interface. */
120 120 /* new style for kernel >= 2.3.33 */
121 121 /************************************/
122   -static int
  122 +static netdev_tx_t
123 123 net_send_packet(struct sk_buff *skb, struct net_device *dev)
124 124 {
125 125 struct net_local *lp = (struct net_local *) dev;
drivers/isdn/i4l/isdn_net.c
Diff comments   View file @ 8b62ff2
... ... @@ -176,7 +176,8 @@
176 176 /* Prototypes */
177 177  
178 178 static int isdn_net_force_dial_lp(isdn_net_local *);
179   -static int isdn_net_start_xmit(struct sk_buff *, struct net_device *);
  179 +static netdev_tx_t isdn_net_start_xmit(struct sk_buff *,
  180 + struct net_device *);
180 181  
181 182 static void isdn_net_ciscohdlck_connected(isdn_net_local *lp);
182 183 static void isdn_net_ciscohdlck_disconnected(isdn_net_local *lp);
... ... @@ -1160,7 +1161,7 @@
1160 1161 * If this interface isn't connected to a ISDN-Channel, find a free channel,
1161 1162 * and start dialing.
1162 1163 */
1163   -static int
  1164 +static netdev_tx_t
1164 1165 isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
1165 1166 {
1166 1167 isdn_net_local *lp = (isdn_net_local *) netdev_priv(ndev);