3 files changed, 23 insertions, 23 deletions

diff --git a/net/802/fddi.c b/net/802/fddi.c
index 0549317b9356..f1611a1e06a7 100644
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -167,23 +167,27 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
 
 EXPORT_SYMBOL(fddi_type_trans);
 
-static int fddi_change_mtu(struct net_device *dev, int new_mtu)
+int fddi_change_mtu(struct net_device *dev, int new_mtu)
 {
         if ((new_mtu < FDDI_K_SNAP_HLEN) || (new_mtu > FDDI_K_SNAP_DLEN))
                 return(-EINVAL);
         dev->mtu = new_mtu;
         return(0);
 }
+EXPORT_SYMBOL(fddi_change_mtu);
 
 static const struct header_ops fddi_header_ops = {
         .create         = fddi_header,
         .rebuild        = fddi_rebuild_header,
 };
 
+
 static void fddi_setup(struct net_device *dev)
 {
-        dev->change_mtu         = fddi_change_mtu;
         dev->header_ops         = &fddi_header_ops;
+#ifdef CONFIG_COMPAT_NET_DEV_OPS
+        dev->change_mtu         = fddi_change_mtu,
+#endif
 
         dev->type               = ARPHRD_FDDI;
         dev->hard_header_len    = FDDI_K_SNAP_HLEN+3;   /* Assume 802.2 SNAP hdr len + 3 pad bytes */
diff --git a/net/802/hippi.c b/net/802/hippi.c
index e35dc1e0915d..313b9ebf92ee 100644
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -144,7 +144,7 @@ __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev)
 
 EXPORT_SYMBOL(hippi_type_trans);
 
-static int hippi_change_mtu(struct net_device *dev, int new_mtu)
+int hippi_change_mtu(struct net_device *dev, int new_mtu)
 {
         /*
          * HIPPI's got these nice large MTUs.
@@ -154,12 +154,13 @@ static int hippi_change_mtu(struct net_device *dev, int new_mtu)
         dev->mtu = new_mtu;
         return(0);
 }
+EXPORT_SYMBOL(hippi_change_mtu);
 
 /*
  * For HIPPI we will actually use the lower 4 bytes of the hardware
  * address as the I-FIELD rather than the actual hardware address.
  */
-static int hippi_mac_addr(struct net_device *dev, void *p)
+int hippi_mac_addr(struct net_device *dev, void *p)
 {
         struct sockaddr *addr = p;
         if (netif_running(dev))
@@ -167,8 +168,9 @@ static int hippi_mac_addr(struct net_device *dev, void *p)
         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
         return 0;
 }
+EXPORT_SYMBOL(hippi_mac_addr);
 
-static int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p)
+int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p)
 {
         /* Never send broadcast/multicast ARP messages */
         p->mcast_probes = 0;
@@ -181,6 +183,7 @@ static int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p)
                 p->ucast_probes = 0;
         return 0;
 }
+EXPORT_SYMBOL(hippi_neigh_setup_dev);
 
 static const struct header_ops hippi_header_ops = {
         .create         = hippi_header,
@@ -190,11 +193,12 @@ static const struct header_ops hippi_header_ops = {
 
 static void hippi_setup(struct net_device *dev)
 {
-        dev->set_multicast_list         = NULL;
+#ifdef CONFIG_COMPAT_NET_DEV_OPS
         dev->change_mtu                 = hippi_change_mtu;
-        dev->header_ops                 = &hippi_header_ops;
         dev->set_mac_address            = hippi_mac_addr;
         dev->neigh_setup                = hippi_neigh_setup_dev;
+#endif
+        dev->header_ops                 = &hippi_header_ops;
 
         /*
          * We don't support HIPPI `ARP' for the time being, and probably
diff --git a/net/802/tr.c b/net/802/tr.c
index 18c66475d8c3..158150fee462 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -285,10 +285,7 @@ void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,
                 if(entry)
                 {
 #if TR_SR_DEBUG
-{
-DECLARE_MAC_BUF(mac);
-printk("source routing for %s\n",print_mac(mac, trh->daddr));
-}
+printk("source routing for %pM\n", trh->daddr);
 #endif
                         if(!entry->local_ring && (ntohs(entry->rcf) & TR_RCF_LEN_MASK) >> 8)
                         {
@@ -370,9 +367,8 @@ static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev)
         if(entry==NULL)
         {
 #if TR_SR_DEBUG
-                DECLARE_MAC_BUF(mac);
-                printk("adding rif_entry: addr:%s rcf:%04X\n",
-                       print_mac(mac, trh->saddr), ntohs(trh->rcf));
+                printk("adding rif_entry: addr:%pM rcf:%04X\n",
+                       trh->saddr, ntohs(trh->rcf));
 #endif
                 /*
                  *      Allocate our new entry. A failure to allocate loses
@@ -417,11 +413,8 @@ static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev)
                          !(trh->rcf & htons(TR_RCF_BROADCAST_MASK)))
                     {
 #if TR_SR_DEBUG
-{
-DECLARE_MAC_BUF(mac);
-printk("updating rif_entry: addr:%s rcf:%04X\n",
-                print_mac(mac, trh->saddr), ntohs(trh->rcf));
-}
+printk("updating rif_entry: addr:%pM rcf:%04X\n",
+                trh->saddr, ntohs(trh->rcf));
 #endif
                             entry->rcf = trh->rcf & htons((unsigned short)~TR_RCF_BROADCAST_MASK);
                             memcpy(&(entry->rseg[0]),&(trh->rseg[0]),8*sizeof(unsigned short));
@@ -532,7 +525,6 @@ static int rif_seq_show(struct seq_file *seq, void *v)
 {
         int j, rcf_len, segment, brdgnmb;
         struct rif_cache *entry = v;
-        DECLARE_MAC_BUF(mac);
 
         if (v == SEQ_START_TOKEN)
                 seq_puts(seq,
@@ -542,9 +534,9 @@ static int rif_seq_show(struct seq_file *seq, void *v)
                 long ttl = (long) (entry->last_used + sysctl_tr_rif_timeout)
                                 - (long) jiffies;
 
-                seq_printf(seq, "%s %s %7li ",
+                seq_printf(seq, "%s %pM %7li ",
                            dev?dev->name:"?",
-                           print_mac(mac, entry->addr),
+                           entry->addr,
                            ttl/HZ);
 
                         if (entry->local_ring)
@@ -643,7 +635,7 @@ static struct ctl_table tr_table[] = {
                 .data           = &sysctl_tr_rif_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec
+                .proc_handler   = proc_dointvec
         },
         { 0 },
 };