openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] orinoco: simplify 802.3 encapsulation code 

Use skb_pull() to strip the addresses from the original packet.  Don't
strip protocol bytes.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Roskin 2006-04-07 04:10:45 -04:00 committed by John W. Linville
parent 470e2aa6db
commit a28dc81dcd
2 changed files with 19 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/net/wireless/orinoco.c
View File

@ -421,9 +421,8 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
hermes_t *hw = &priv->hw; hermes_t *hw = &priv->hw;
int err = 0; int err = 0;
u16 txfid = priv->txfid; u16 txfid = priv->txfid;
char *p;
struct ethhdr *eh; struct ethhdr *eh;
int data_len, data_off; int data_off;
struct hermes_tx_descriptor desc; struct hermes_tx_descriptor desc;
unsigned long flags; unsigned long flags;
@ -453,8 +452,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
} }
/* Check packet length */ /* Check packet length */
data_len = skb->len; if (skb->len < ETH_HLEN)
if (data_len < ETH_HLEN)
goto drop; goto drop;
eh = (struct ethhdr *)skb->data; eh = (struct ethhdr *)skb->data;
@ -477,22 +475,22 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
/* Encapsulate Ethernet-II frames */ /* Encapsulate Ethernet-II frames */
if (ntohs(eh->h_proto) > ETH_DATA_LEN) { /* Ethernet-II frame */ if (ntohs(eh->h_proto) > ETH_DATA_LEN) { /* Ethernet-II frame */
struct header_struct hdr; struct header_struct {
data_len = skb->len - ETH_HLEN; struct ethhdr eth; /* 802.3 header */
data_off = HERMES_802_3_OFFSET + sizeof(hdr); u8 encap[6]; /* 802.2 header */
p = skb->data + ETH_HLEN; } __attribute__ ((packed)) hdr;
/* 802.3 header */ /* Strip destination and source from the data */
memcpy(hdr.dest, eh->h_dest, ETH_ALEN); skb_pull(skb, 2 * ETH_ALEN);
memcpy(hdr.src, eh->h_source, ETH_ALEN); data_off = HERMES_802_2_OFFSET + sizeof(encaps_hdr);
hdr.len = htons(data_len + ENCAPS_OVERHEAD);
/* And move them to a separate header */
/* 802.2 header */ memcpy(&hdr.eth, eh, 2 * ETH_ALEN);
memcpy(&hdr.dsap, &encaps_hdr, sizeof(encaps_hdr)); hdr.eth.h_proto = htons(sizeof(encaps_hdr) + skb->len);
memcpy(hdr.encap, encaps_hdr, sizeof(encaps_hdr));
hdr.ethertype = eh->h_proto;
err = hermes_bap_pwrite(hw, USER_BAP, &hdr, sizeof(hdr), err = hermes_bap_pwrite(hw, USER_BAP, &hdr, sizeof(hdr),
txfid, HERMES_802_3_OFFSET); txfid, HERMES_802_3_OFFSET);
if (err) { if (err) {
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_ERR "%s: Error %d writing packet " printk(KERN_ERR "%s: Error %d writing packet "
@ -500,12 +498,10 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
goto busy; goto busy;
} }
} else { /* IEEE 802.3 frame */ } else { /* IEEE 802.3 frame */
data_len = skb->len;
data_off = HERMES_802_3_OFFSET; data_off = HERMES_802_3_OFFSET;
p = skb->data;
} }
err = hermes_bap_pwrite(hw, USER_BAP, p, data_len, err = hermes_bap_pwrite(hw, USER_BAP, skb->data, skb->len,
txfid, data_off); txfid, data_off);
if (err) { if (err) {
printk(KERN_ERR "%s: Error %d writing packet to BAP\n", printk(KERN_ERR "%s: Error %d writing packet to BAP\n",
@ -527,7 +523,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
} }
dev->trans_start = jiffies; dev->trans_start = jiffies;
stats->tx_bytes += data_off + data_len; stats->tx_bytes += data_off + skb->len;
goto ok; goto ok;
drop: drop:

14
drivers/net/wireless/orinoco.h
View File

@ -30,20 +30,6 @@ struct orinoco_key {
char data[ORINOCO_MAX_KEY_SIZE]; char data[ORINOCO_MAX_KEY_SIZE];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct header_struct {
/* 802.3 */
u8 dest[ETH_ALEN];
u8 src[ETH_ALEN];
__be16 len;
/* 802.2 */
u8 dsap;
u8 ssap;
u8 ctrl;
/* SNAP */
u8 oui[3];
unsigned short ethertype;
} __attribute__ ((packed));
typedef enum { typedef enum {
FIRMWARE_TYPE_AGERE, FIRMWARE_TYPE_AGERE,
FIRMWARE_TYPE_INTERSIL, FIRMWARE_TYPE_INTERSIL,