5 files changed, 11 insertions, 14 deletions

diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index 6028bbb3b28a..9d8d1ac48176 100644
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -1352,7 +1352,7 @@ void rtm_set_timer(struct s_smc *smc)
         /*
          * MIB timer and hardware timer have the same resolution of 80nS
          */
-        DB_RMT("RMT: setting new fddiPATHT_Rmode, t = %d ns \n",
+        DB_RMT("RMT: setting new fddiPATHT_Rmode, t = %d ns\n",
                 (int) smc->mib.a[PATH0].fddiPATHT_Rmode,0) ;
         outpd(ADDR(B2_RTM_INI),smc->mib.a[PATH0].fddiPATHT_Rmode) ;
 }
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c
index e6b33ee05ede..ba45bc794d77 100644
--- a/drivers/net/skfp/pcmplc.c
+++ b/drivers/net/skfp/pcmplc.c
@@ -1277,7 +1277,7 @@ static void pc_rcode_actions(struct s_smc *smc, int bit, struct s_phy *phy)
 
         mib = phy->mib ;
 
-        DB_PCMN(1,"SIG rec %x %x: \n", bit,phy->r_val[bit] ) ;
+        DB_PCMN(1,"SIG rec %x %x:\n", bit,phy->r_val[bit] ) ;
         bit++ ;
 
         switch(bit) {
@@ -1580,7 +1580,7 @@ static void pc_tcode_actions(struct s_smc *smc, const int bit, struct s_phy *phy
                 mib->fddiPORTMacIndicated.T_val = phy->t_val[9] ;
                 break ;
         }
-        DB_PCMN(1,"SIG snd %x %x: \n", bit,phy->t_val[bit] ) ;
+        DB_PCMN(1,"SIG snd %x %x:\n", bit,phy->t_val[bit] ) ;
 }
 
 /*
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index d9016b75abc2..31b2dabf094c 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -844,7 +844,6 @@ static void skfp_ctl_set_multicast_list(struct net_device *dev)
         spin_lock_irqsave(&bp->DriverLock, Flags);
         skfp_ctl_set_multicast_list_wo_lock(dev);
         spin_unlock_irqrestore(&bp->DriverLock, Flags);
-        return;
 }                               // skfp_ctl_set_multicast_list
 
 
@@ -852,7 +851,7 @@ static void skfp_ctl_set_multicast_list(struct net_device *dev)
 static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
 {
         struct s_smc *smc = netdev_priv(dev);
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
 
         /* Enable promiscuous mode, if necessary */
         if (dev->flags & IFF_PROMISC) {
@@ -876,13 +875,13 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
                                 /* use exact filtering */
 
                                 // point to first multicast addr
-                                netdev_for_each_mc_addr(dmi, dev) {
-                                        mac_add_multicast(smc, 
-                                                          (struct fddi_addr *)dmi->dmi_addr, 
-                                                          1);
+                                netdev_for_each_mc_addr(ha, dev) {
+                                        mac_add_multicast(smc,
+                                                (struct fddi_addr *)ha->addr,
+                                                1);
 
                                         pr_debug(KERN_INFO "ENABLE MC ADDRESS: %pMF\n",
-                                                dmi->dmi_addr);
+                                                ha->addr);
                                 }
 
                         } else {        // more MC addresses than HW supports
@@ -898,7 +897,6 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
                 /* Update adapter filters */
                 mac_update_multicast(smc);
         }
-        return;
 }                               // skfp_ctl_set_multicast_list_wo_lock
 
 
@@ -1076,7 +1074,6 @@ static netdev_tx_t skfp_send_pkt(struct sk_buff *skb,
         if (bp->QueueSkb == 0) {
                 netif_stop_queue(dev);
         }
-        dev->trans_start = jiffies;
         return NETDEV_TX_OK;
 
 }                               // skfp_send_pkt
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c
index 83d16fecfac4..6f35bb77595f 100644
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
@@ -574,7 +574,7 @@ void smt_received_pack(struct s_smc *smc, SMbuf *mb, int fs)
                 if (smt_check_para(smc,sm,plist_nif)) {
                         DB_SMT("SMT: NIF with para problem, ignoring\n",0,0) ;
                         break ;
-                } ;
+                }
                 switch (sm->smt_type) {
                 case SMT_ANNOUNCE :
                 case SMT_REQUEST :
diff --git a/drivers/net/skfp/srf.c b/drivers/net/skfp/srf.c
index 6caf713b744c..40882b3faba6 100644
--- a/drivers/net/skfp/srf.c
+++ b/drivers/net/skfp/srf.c
@@ -414,7 +414,7 @@ static void smt_send_srf(struct s_smc *smc)
         smt->smt_len = SMT_MAX_INFO_LEN - pcon.pc_len ;
         mb->sm_len = smt->smt_len + sizeof(struct smt_header) ;
 
-        DB_SMT("SRF: sending SRF at %x, len %d \n",smt,mb->sm_len) ;
+        DB_SMT("SRF: sending SRF at %x, len %d\n",smt,mb->sm_len) ;
         DB_SMT("SRF: state SR%d Threshold %d\n",
                 smc->srf.sr_state,smc->srf.SRThreshold/TICKS_PER_SECOND) ;
 #ifdef  DEBUG