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