merge by hand - fix up rejections in Documentation/DocBook/Makefile

9 files changed, 11 insertions, 32 deletions

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 067b353e1cbd..89454915b857 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -394,13 +394,11 @@ static void sp_bump(struct sixpack *sp, char cmd)
         if ((skb = dev_alloc_skb(count)) == NULL)
                 goto out_mem;
 
-        skb->dev = sp->dev;
         ptr = skb_put(skb, count);
         *ptr++ = cmd;   /* KISS command */
 
         memcpy(ptr, sp->cooked_buf + 1, count);
-        skb->mac.raw = skb->data;
-        skb->protocol = htons(ETH_P_AX25);
+        skb->protocol = ax25_type_trans(skb, sp->dev);
         netif_rx(skb);
         sp->dev->last_rx = jiffies;
         sp->stats.rx_packets++;
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 34068f81d45e..7cdebe1a0b61 100644
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -45,7 +45,7 @@ config BPQETHER
 
 config DMASCC
         tristate "High-speed (DMA) SCC driver for AX.25"
-        depends on ISA && AX25 && BROKEN_ON_SMP
+        depends on ISA && AX25 && BROKEN_ON_SMP && ISA_DMA_API
         ---help---
           This is a driver for high-speed SCC boards, i.e. those supporting
           DMA on one port. You usually use those boards to connect your
@@ -78,7 +78,7 @@ config DMASCC
 
 config SCC
         tristate "Z8530 SCC driver"
-        depends on ISA && AX25
+        depends on ISA && AX25 && ISA_DMA_API
         ---help---
           These cards are used to connect your Linux box to an amateur radio
           in order to communicate with other computers. If you want to use
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index e8cb87d906fc..1c563f905a59 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -601,12 +601,10 @@ static void do_rxpacket(struct net_device *dev)
                 bc->stats.rx_dropped++;
                 return;
         }
-        skb->dev = dev;
         cp = skb_put(skb, pktlen);
         *cp++ = 0; /* KISS kludge */
         memcpy(cp, bc->hdlcrx.buf, pktlen - 1);
-        skb->protocol = htons(ETH_P_AX25);
-        skb->mac.raw = skb->data;
+        skb->protocol = ax25_type_trans(skb, dev);
         netif_rx(skb);
         dev->last_rx = jiffies;
         bc->stats.rx_packets++;
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index ef1a359e2273..ba9f0580e1f9 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -211,11 +211,7 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty
         ptr = skb_push(skb, 1);
         *ptr = 0;
 
-        skb->dev = dev;
-        skb->protocol = htons(ETH_P_AX25);
-        skb->mac.raw = skb->data;
-        skb->pkt_type = PACKET_HOST;
-
+        skb->protocol = ax25_type_trans(skb, dev);
         netif_rx(skb);
         dev->last_rx = jiffies;
 unlock:
@@ -272,8 +268,6 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
                 skb = newskb;
         }
 
-        skb->protocol = htons(ETH_P_AX25);
-
         ptr = skb_push(skb, 2);
 
         *ptr++ = (size + 5) % 256;
@@ -287,7 +281,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
                 return -ENODEV;
         }
 
-        skb->dev = dev;
+        skb->protocol = ax25_type_trans(skb, dev);
         skb->nh.raw = skb->data;
         dev->hard_header(skb, dev, ETH_P_BPQ, bpq->dest_addr, NULL, 0);
         bpq->stats.tx_packets++;
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index f3269b70a8c5..f515245a3fd0 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -1306,9 +1306,7 @@ static void rx_bh(void *arg)
                         data = skb_put(skb, cb + 1);
                         data[0] = 0;
                         memcpy(&data[1], priv->rx_buf[i], cb);
-                        skb->dev = priv->dev;
-                        skb->protocol = ntohs(ETH_P_AX25);
-                        skb->mac.raw = skb->data;
+                        skb->protocol = ax25_type_trans(skb, priv->dev);
                         netif_rx(skb);
                         priv->dev->last_rx = jiffies;
                         priv->stats.rx_packets++;
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index b89959a596d7..b4c836e4fe86 100644
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -174,12 +174,10 @@ static void hdlc_rx_flag(struct net_device *dev, struct hdlcdrv_state *s)
                 s->stats.rx_dropped++;
                 return;
         }
-        skb->dev = dev;
         cp = skb_put(skb, pkt_len);
         *cp++ = 0; /* KISS kludge */
         memcpy(cp, s->hdlcrx.buffer, pkt_len - 1);
-        skb->protocol = htons(ETH_P_AX25);
-        skb->mac.raw = skb->data;
+        skb->protocol = ax25_type_trans(skb, dev);
         netif_rx(skb);
         dev->last_rx = jiffies;
         s->stats.rx_packets++;
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index d9ea080aea0f..62790511098f 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -332,12 +332,10 @@ static void ax_bump(struct ax_disp *ax)
                 return;
         }
 
-        skb->dev      = ax->dev;
         spin_lock_bh(&ax->buflock);
         memcpy(skb_put(skb,count), ax->rbuff, count);
         spin_unlock_bh(&ax->buflock);
-        skb->mac.raw  = skb->data;
-        skb->protocol = htons(ETH_P_AX25);
+        skb->protocol = ax25_type_trans(skb, ax->dev);
         netif_rx(skb);
         ax->dev->last_rx = jiffies;
         ax->rx_packets++;
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index ce9e7af020da..ece1b1a13186 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1630,10 +1630,7 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb)
         scc->dev_stat.rx_packets++;
         scc->dev_stat.rx_bytes += skb->len;
 
-        skb->dev      = scc->dev;
-        skb->protocol = htons(ETH_P_AX25);
-        skb->mac.raw  = skb->data;
-        skb->pkt_type = PACKET_HOST;
+        skb->protocol = ax25_type_trans(skb, scc->dev);
         
         netif_rx(skb);
         scc->dev->last_rx = jiffies;
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index fd7b00fe38e5..41213ef602dc 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -522,12 +522,10 @@ static inline void yam_rx_flag(struct net_device *dev, struct yam_port *yp)
                                 ++yp->stats.rx_dropped;
                         } else {
                                 unsigned char *cp;
-                                skb->dev = dev;
                                 cp = skb_put(skb, pkt_len);
                                 *cp++ = 0;              /* KISS kludge */
                                 memcpy(cp, yp->rx_buf, pkt_len - 1);
-                                skb->protocol = htons(ETH_P_AX25);
-                                skb->mac.raw = skb->data;
+                                skb->protocol = ax25_type_trans(skb, dev);
                                 netif_rx(skb);
                                 dev->last_rx = jiffies;
                                 ++yp->stats.rx_packets;