aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/skge.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/skge.c')
-rw-r--r--drivers/net/skge.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 50eb70609f20..96eee8666877 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2918,7 +2918,7 @@ static void genesis_set_multicast(struct net_device *dev)
2918 struct skge_port *skge = netdev_priv(dev); 2918 struct skge_port *skge = netdev_priv(dev);
2919 struct skge_hw *hw = skge->hw; 2919 struct skge_hw *hw = skge->hw;
2920 int port = skge->port; 2920 int port = skge->port;
2921 struct dev_mc_list *list; 2921 struct netdev_hw_addr *ha;
2922 u32 mode; 2922 u32 mode;
2923 u8 filter[8]; 2923 u8 filter[8];
2924 2924
@@ -2938,8 +2938,8 @@ static void genesis_set_multicast(struct net_device *dev)
2938 skge->flow_status == FLOW_STAT_SYMMETRIC) 2938 skge->flow_status == FLOW_STAT_SYMMETRIC)
2939 genesis_add_filter(filter, pause_mc_addr); 2939 genesis_add_filter(filter, pause_mc_addr);
2940 2940
2941 netdev_for_each_mc_addr(list, dev) 2941 netdev_for_each_mc_addr(ha, dev)
2942 genesis_add_filter(filter, list->dmi_addr); 2942 genesis_add_filter(filter, ha->addr);
2943 } 2943 }
2944 2944
2945 xm_write32(hw, port, XM_MODE, mode); 2945 xm_write32(hw, port, XM_MODE, mode);
@@ -2957,7 +2957,7 @@ static void yukon_set_multicast(struct net_device *dev)
2957 struct skge_port *skge = netdev_priv(dev); 2957 struct skge_port *skge = netdev_priv(dev);
2958 struct skge_hw *hw = skge->hw; 2958 struct skge_hw *hw = skge->hw;
2959 int port = skge->port; 2959 int port = skge->port;
2960 struct dev_mc_list *list; 2960 struct netdev_hw_addr *ha;
2961 int rx_pause = (skge->flow_status == FLOW_STAT_REM_SEND || 2961 int rx_pause = (skge->flow_status == FLOW_STAT_REM_SEND ||
2962 skge->flow_status == FLOW_STAT_SYMMETRIC); 2962 skge->flow_status == FLOW_STAT_SYMMETRIC);
2963 u16 reg; 2963 u16 reg;
@@ -2980,8 +2980,8 @@ static void yukon_set_multicast(struct net_device *dev)
2980 if (rx_pause) 2980 if (rx_pause)
2981 yukon_add_filter(filter, pause_mc_addr); 2981 yukon_add_filter(filter, pause_mc_addr);
2982 2982
2983 netdev_for_each_mc_addr(list, dev) 2983 netdev_for_each_mc_addr(ha, dev)
2984 yukon_add_filter(filter, list->dmi_addr); 2984 yukon_add_filter(filter, ha->addr);
2985 } 2985 }
2986 2986
2987 2987
@@ -3667,7 +3667,7 @@ static int skge_debug_show(struct seq_file *seq, void *v)
3667 t->csum_offs, t->csum_write, t->csum_start); 3667 t->csum_offs, t->csum_write, t->csum_start);
3668 } 3668 }
3669 3669
3670 seq_printf(seq, "\nRx Ring: \n"); 3670 seq_printf(seq, "\nRx Ring:\n");
3671 for (e = skge->rx_ring.to_clean; ; e = e->next) { 3671 for (e = skge->rx_ring.to_clean; ; e = e->next) {
3672 const struct skge_rx_desc *r = e->desc; 3672 const struct skge_rx_desc *r = e->desc;
3673 3673