5 files changed, 18 insertions, 20 deletions

diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 055a918067e6..0d7645581f91 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -515,37 +515,37 @@ static int ppp_rx(struct sk_buff *skb)
         switch (cp->code) {
         case CP_CONF_REQ:
                 ppp_cp_parse_cr(dev, pid, cp->id, len, skb->data);
-                goto out;
+                break;
 
         case CP_CONF_ACK:
                 if (cp->id == proto->cr_id)
                         ppp_cp_event(dev, pid, RCA, 0, 0, 0, NULL);
-                goto out;
+                break;
 
         case CP_CONF_REJ:
         case CP_CONF_NAK:
                 if (cp->id == proto->cr_id)
                         ppp_cp_event(dev, pid, RCN, 0, 0, 0, NULL);
-                goto out;
+                break;
 
         case CP_TERM_REQ:
                 ppp_cp_event(dev, pid, RTR, 0, cp->id, 0, NULL);
-                goto out;
+                break;
 
         case CP_TERM_ACK:
                 ppp_cp_event(dev, pid, RTA, 0, 0, 0, NULL);
-                goto out;
+                break;
 
         case CP_CODE_REJ:
                 ppp_cp_event(dev, pid, RXJ_BAD, 0, 0, 0, NULL);
-                goto out;
+                break;
 
         default:
                 len += sizeof(struct cp_header);
                 if (len > dev->mtu)
                         len = dev->mtu;
                 ppp_cp_event(dev, pid, RUC, 0, 0, len, cp);
-                goto out;
+                break;
         }
         goto out;
 
diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
index 56aeb011cb3d..a49aec5efd20 100644
--- a/drivers/net/wan/hdlc_x25.c
+++ b/drivers/net/wan/hdlc_x25.c
@@ -134,15 +134,15 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static int x25_open(struct net_device *dev)
 {
-        struct lapb_register_struct cb;
         int result;
-
-        cb.connect_confirmation = x25_connected;
-        cb.connect_indication = x25_connected;
-        cb.disconnect_confirmation = x25_disconnected;
-        cb.disconnect_indication = x25_disconnected;
-        cb.data_indication = x25_data_indication;
-        cb.data_transmit = x25_data_transmit;
+        static const struct lapb_register_struct cb = {
+                .connect_confirmation = x25_connected,
+                .connect_indication = x25_connected,
+                .disconnect_confirmation = x25_disconnected,
+                .disconnect_indication = x25_disconnected,
+                .data_indication = x25_data_indication,
+                .data_transmit = x25_data_transmit,
+        };
 
         result = lapb_register(dev, &cb);
         if (result != LAPB_OK)
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index a817081737a0..7beeb9b88a3b 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -259,14 +259,13 @@ static int lapbeth_set_mac_address(struct net_device *dev, void *addr)
 }
 
 
-static struct lapb_register_struct lapbeth_callbacks = {
+static const struct lapb_register_struct lapbeth_callbacks = {
         .connect_confirmation    = lapbeth_connected,
         .connect_indication      = lapbeth_connected,
         .disconnect_confirmation = lapbeth_disconnected,
         .disconnect_indication   = lapbeth_disconnected,
         .data_indication         = lapbeth_data_indication,
         .data_transmit           = lapbeth_data_transmit,
-
 };
 
 /*
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 86127bcc9f7a..783168cce077 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -212,7 +212,7 @@ static const struct net_device_ops sbni_netdev_ops = {
         .ndo_open               = sbni_open,
         .ndo_stop               = sbni_close,
         .ndo_start_xmit         = sbni_start_xmit,
-        .ndo_set_multicast_list = set_multicast_list,
+        .ndo_set_rx_mode        = set_multicast_list,
         .ndo_do_ioctl           = sbni_ioctl,
         .ndo_change_mtu         = eth_change_mtu,
         .ndo_set_mac_address    = eth_mac_addr,
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 46ceb3ae9073..8a10bb730d5a 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -434,14 +434,13 @@ static void x25_asy_disconnected(struct net_device *dev, int reason)
         netif_rx(skb);
 }
 
-static struct lapb_register_struct x25_asy_callbacks = {
+static const struct lapb_register_struct x25_asy_callbacks = {
         .connect_confirmation = x25_asy_connected,
         .connect_indication = x25_asy_connected,
         .disconnect_confirmation = x25_asy_disconnected,
         .disconnect_indication = x25_asy_disconnected,
         .data_indication = x25_asy_data_indication,
         .data_transmit = x25_asy_data_transmit,
-
 };