aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r--drivers/net/gianfar.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 642dc633b444..393a0f175302 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -138,6 +138,7 @@ static int gfar_poll(struct napi_struct *napi, int budget);
138static void gfar_netpoll(struct net_device *dev); 138static void gfar_netpoll(struct net_device *dev);
139#endif 139#endif
140int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit); 140int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit);
141static int gfar_clean_tx_ring(struct net_device *dev);
141static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int length); 142static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int length);
142static void gfar_vlan_rx_register(struct net_device *netdev, 143static void gfar_vlan_rx_register(struct net_device *netdev,
143 struct vlan_group *grp); 144 struct vlan_group *grp);
@@ -634,6 +635,8 @@ static void free_skb_resources(struct gfar_private *priv)
634 dev_kfree_skb_any(priv->tx_skbuff[i]); 635 dev_kfree_skb_any(priv->tx_skbuff[i]);
635 priv->tx_skbuff[i] = NULL; 636 priv->tx_skbuff[i] = NULL;
636 } 637 }
638
639 txbdp++;
637 } 640 }
638 641
639 kfree(priv->tx_skbuff); 642 kfree(priv->tx_skbuff);
@@ -1141,7 +1144,7 @@ static int gfar_close(struct net_device *dev)
1141} 1144}
1142 1145
1143/* Changes the mac address if the controller is not running. */ 1146/* Changes the mac address if the controller is not running. */
1144int gfar_set_mac_address(struct net_device *dev) 1147static int gfar_set_mac_address(struct net_device *dev)
1145{ 1148{
1146 gfar_set_mac_for_addr(dev, 0, dev->dev_addr); 1149 gfar_set_mac_for_addr(dev, 0, dev->dev_addr);
1147 1150
@@ -1260,7 +1263,7 @@ static void gfar_timeout(struct net_device *dev)
1260} 1263}
1261 1264
1262/* Interrupt Handler for Transmit complete */ 1265/* Interrupt Handler for Transmit complete */
1263int gfar_clean_tx_ring(struct net_device *dev) 1266static int gfar_clean_tx_ring(struct net_device *dev)
1264{ 1267{
1265 struct txbd8 *bdp; 1268 struct txbd8 *bdp;
1266 struct gfar_private *priv = netdev_priv(dev); 1269 struct gfar_private *priv = netdev_priv(dev);