lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[AX25] Introduce ax25_type_trans

Browse Source 
Replacing the open coded equivalents and making ax25 look more like
a linux network protocol, i.e. more similar to inet.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo
2005-04-24 18:53:06 -07:00
committed by David S. Miller
parent 3b2d59d1fc
commit 56cb515628
11 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/hamradio/6pack.c
View File

@@ -394,13 +394,11 @@ static void sp_bump(struct sixpack *sp, char cmd)
if ((skb = dev_alloc_skb(count)) == NULL) if ((skb = dev_alloc_skb(count)) == NULL)
goto out_mem; goto out_mem;
skb->dev = sp->dev;
ptr = skb_put(skb, count); ptr = skb_put(skb, count);
*ptr++ = cmd; /* KISS command */ *ptr++ = cmd; /* KISS command */
memcpy(ptr, sp->cooked_buf + 1, count); memcpy(ptr, sp->cooked_buf + 1, count);
skb->mac.raw = skb->data; skb->protocol = ax25_type_trans(skb, sp->dev);
skb->protocol = htons(ETH_P_AX25);
netif_rx(skb); netif_rx(skb);
sp->dev->last_rx = jiffies; sp->dev->last_rx = jiffies;
sp->stats.rx_packets++; sp->stats.rx_packets++;

4
drivers/net/hamradio/baycom_epp.c
View File

@@ -601,12 +601,10 @@ static void do_rxpacket(struct net_device *dev)
bc->stats.rx_dropped++; bc->stats.rx_dropped++;
return; return;
} }
skb->dev = dev;
cp = skb_put(skb, pktlen); cp = skb_put(skb, pktlen);
*cp++ = 0; /* KISS kludge */ *cp++ = 0; /* KISS kludge */
memcpy(cp, bc->hdlcrx.buf, pktlen - 1); memcpy(cp, bc->hdlcrx.buf, pktlen - 1);
skb->protocol = htons(ETH_P_AX25); skb->protocol = ax25_type_trans(skb, dev);
skb->mac.raw = skb->data;
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies; dev->last_rx = jiffies;
bc->stats.rx_packets++; bc->stats.rx_packets++;

10
drivers/net/hamradio/bpqether.c
View File

@@ -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 = skb_push(skb, 1);
*ptr = 0; *ptr = 0;
skb->dev = dev; skb->protocol = ax25_type_trans(skb, dev);
skb->protocol = htons(ETH_P_AX25);
skb->mac.raw = skb->data;
skb->pkt_type = PACKET_HOST;
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies; dev->last_rx = jiffies;
unlock: unlock:
@@ -272,8 +268,6 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
skb = newskb; skb = newskb;
} }
skb->protocol = htons(ETH_P_AX25);
ptr = skb_push(skb, 2); ptr = skb_push(skb, 2);
*ptr++ = (size + 5) % 256; *ptr++ = (size + 5) % 256;
@@ -287,7 +281,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
return -ENODEV; return -ENODEV;
} }
skb->dev = dev; skb->protocol = ax25_type_trans(skb, dev);
skb->nh.raw = skb->data; skb->nh.raw = skb->data;
dev->hard_header(skb, dev, ETH_P_BPQ, bpq->dest_addr, NULL, 0); dev->hard_header(skb, dev, ETH_P_BPQ, bpq->dest_addr, NULL, 0);
bpq->stats.tx_packets++; bpq->stats.tx_packets++;

4
drivers/net/hamradio/dmascc.c
View File

@@ -1306,9 +1306,7 @@ static void rx_bh(void *arg)
data = skb_put(skb, cb + 1); data = skb_put(skb, cb + 1);
data[0] = 0; data[0] = 0;
memcpy(&data[1], priv->rx_buf[i], cb); memcpy(&data[1], priv->rx_buf[i], cb);
skb->dev = priv->dev; skb->protocol = ax25_type_trans(skb, priv->dev);
skb->protocol = ntohs(ETH_P_AX25);
skb->mac.raw = skb->data;
netif_rx(skb); netif_rx(skb);
priv->dev->last_rx = jiffies; priv->dev->last_rx = jiffies;
priv->stats.rx_packets++; priv->stats.rx_packets++;

4
drivers/net/hamradio/hdlcdrv.c
View File

@@ -174,12 +174,10 @@ static void hdlc_rx_flag(struct net_device *dev, struct hdlcdrv_state *s)
s->stats.rx_dropped++; s->stats.rx_dropped++;
return; return;
} }
skb->dev = dev;
cp = skb_put(skb, pkt_len); cp = skb_put(skb, pkt_len);
*cp++ = 0; /* KISS kludge */ *cp++ = 0; /* KISS kludge */
memcpy(cp, s->hdlcrx.buffer, pkt_len - 1); memcpy(cp, s->hdlcrx.buffer, pkt_len - 1);
skb->protocol = htons(ETH_P_AX25); skb->protocol = ax25_type_trans(skb, dev);
skb->mac.raw = skb->data;
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies; dev->last_rx = jiffies;
s->stats.rx_packets++; s->stats.rx_packets++;

4
drivers/net/hamradio/mkiss.c
View File

@@ -332,12 +332,10 @@ static void ax_bump(struct ax_disp *ax)
return; return;
} }
skb->dev = ax->dev;
spin_lock_bh(&ax->buflock); spin_lock_bh(&ax->buflock);
memcpy(skb_put(skb,count), ax->rbuff, count); memcpy(skb_put(skb,count), ax->rbuff, count);
spin_unlock_bh(&ax->buflock); spin_unlock_bh(&ax->buflock);
skb->mac.raw = skb->data; skb->protocol = ax25_type_trans(skb, ax->dev);
skb->protocol = htons(ETH_P_AX25);
netif_rx(skb); netif_rx(skb);
ax->dev->last_rx = jiffies; ax->dev->last_rx = jiffies;
ax->rx_packets++; ax->rx_packets++;

5
drivers/net/hamradio/scc.c
View File

@@ -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_packets++;
scc->dev_stat.rx_bytes += skb->len; scc->dev_stat.rx_bytes += skb->len;
skb->dev = scc->dev; skb->protocol = ax25_type_trans(skb, scc->dev);
skb->protocol = htons(ETH_P_AX25);
skb->mac.raw = skb->data;
skb->pkt_type = PACKET_HOST;
netif_rx(skb); netif_rx(skb);
scc->dev->last_rx = jiffies; scc->dev->last_rx = jiffies;

4
drivers/net/hamradio/yam.c
View File

@@ -522,12 +522,10 @@ static inline void yam_rx_flag(struct net_device *dev, struct yam_port *yp)
++yp->stats.rx_dropped; ++yp->stats.rx_dropped;
} else { } else {
unsigned char *cp; unsigned char *cp;
skb->dev = dev;
cp = skb_put(skb, pkt_len); cp = skb_put(skb, pkt_len);
*cp++ = 0; /* KISS kludge */ *cp++ = 0; /* KISS kludge */
memcpy(cp, yp->rx_buf, pkt_len - 1); memcpy(cp, yp->rx_buf, pkt_len - 1);
skb->protocol = htons(ETH_P_AX25); skb->protocol = ax25_type_trans(skb, dev);
skb->mac.raw = skb->data;
netif_rx(skb); netif_rx(skb);
dev->last_rx = jiffies; dev->last_rx = jiffies;
++yp->stats.rx_packets; ++yp->stats.rx_packets;

8
include/net/ax25.h
View File

@@ -220,6 +220,14 @@ static __inline__ void ax25_cb_put(ax25_cb *ax25)
} }
} }
static inline unsigned short ax25_type_trans(struct sk_buff *skb, struct net_device *dev)
{
skb->dev = dev;
skb->pkt_type = PACKET_HOST;
skb->mac.raw = skb->data;
return htons(ETH_P_AX25);
}
/* af_ax25.c */ /* af_ax25.c */
extern struct hlist_head ax25_list; extern struct hlist_head ax25_list;
extern spinlock_t ax25_list_lock; extern spinlock_t ax25_list_lock;

3
net/ax25/ax25_ds_subr.c
View File

@@ -143,8 +143,7 @@ static void ax25_kiss_cmd(ax25_dev *ax25_dev, unsigned char cmd, unsigned char p
*p++ = cmd; *p++ = cmd;
*p++ = param; *p++ = param;
skb->dev = ax25_dev->dev; skb->protocol = ax25_type_trans(skb, ax25_dev->dev);
skb->protocol = htons(ETH_P_AX25);
dev_queue_xmit(skb); dev_queue_xmit(skb);
} }

3
net/ax25/ax25_out.c
View File

@@ -351,8 +351,7 @@ void ax25_queue_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
unsigned char *ptr; unsigned char *ptr;
skb->protocol = htons(ETH_P_AX25); skb->protocol = ax25_type_trans(skb, ax25_fwd_dev(dev));
skb->dev = ax25_fwd_dev(dev);
ptr = skb_push(skb, 1); ptr = skb_push(skb, 1);
*ptr = 0x00; /* KISS */ *ptr = 0x00; /* KISS */