apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

[SK_BUFF]: Introduce skb_reset_network_header(skb)

Browse Source 
For the common, open coded 'skb->nh.raw = skb->data' operation, so that we can
later turn skb->nh.raw into a offset, reducing the size of struct sk_buff in
64bit land while possibly keeping it as a pointer on 32bit.

This one touches just the most simple case, next will handle the slightly more
"complex" cases.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo
2007-04-10 20:45:18 -07:00
committed by David S. Miller
parent 57effc70a5
commit c1d2bbe1cd
47 changed files with 78 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/block/aoe/aoecmd.c
+1 -1
View File
@@ -28,7 +28,7 @@ new_skb(ulong len)
skb = alloc_skb(len, GFP_ATOMIC);
if (skb) {
skb_reset_mac_header(skb);
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
skb->protocol = __constant_htons(ETH_P_AOE);
skb->priority = 0;
skb->next = skb->prev = NULL;
drivers/net/cxgb3/sge.c
+2 -1
View File
@@ -1621,7 +1621,8 @@ static inline int rx_offload(struct t3cdev *tdev, struct sge_rspq *rq,
{
rq->offload_pkts++;
skb_reset_mac_header(skb);
skb->nh.raw = skb->h.raw = skb->data;
skb_reset_network_header(skb);
skb->h.raw = skb->data;
if (rq->polling) {
rx_gather[gather_idx++] = skb;
drivers/net/hamradio/bpqether.c
+1 -1
View File
@@ -282,7 +282,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
}
skb->protocol = ax25_type_trans(skb, dev);
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
dev->hard_header(skb, dev, ETH_P_BPQ, bpq->dest_addr, NULL, 0);
bpq->stats.tx_packets++;
bpq->stats.tx_bytes+=skb->len;
drivers/net/loopback.c
+1 -1
View File
@@ -91,7 +91,7 @@ static void emulate_large_send_offload(struct sk_buff *skb)
break;
skb_reserve(nskb, 32);
skb_set_mac_header(nskb, -ETH_HLEN);
nskb->nh.raw = nskb->data;
skb_reset_network_header(nskb);
iph = nskb->nh.iph;
memcpy(nskb->data, skb->nh.raw, doffset);
if (skb_copy_bits(skb,
drivers/net/pppoe.c
+2 -2
View File
@@ -799,7 +799,7 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock,
/* Reserve space for headers. */
skb_reserve(skb, dev->hard_header_len);
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
skb->dev = dev;
@@ -884,7 +884,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
memcpy(ph, &hdr, sizeof(struct pppoe_hdr));
skb2->protocol = __constant_htons(ETH_P_PPP_SES);
skb2->nh.raw = skb2->data;
skb_reset_network_header(skb2);
skb2->dev = dev;
drivers/net/wan/hdlc_cisco.c
+1 -1
View File
@@ -124,7 +124,7 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type,
skb_put(skb, sizeof(struct cisco_packet));
skb->priority = TC_PRIO_CONTROL;
skb->dev = dev;
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
dev_queue_xmit(skb);
}
drivers/net/wan/hdlc_fr.c
+1 -1
View File
@@ -590,7 +590,7 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)
skb_put(skb, i);
skb->priority = TC_PRIO_CONTROL;
skb->dev = dev;
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
dev_queue_xmit(skb);
}
drivers/net/wan/lmc/lmc_main.c
+2 -2
View File
@@ -1668,7 +1668,7 @@ static int lmc_rx (struct net_device *dev) /*fold00*/
skb->protocol = lmc_proto_type(sc, skb);
skb->protocol = htons(ETH_P_WAN_PPP);
skb_reset_mac_header(skb);
// skb->nh.raw = skb->data;
/* skb_reset_network_header(skb); */
skb->dev = dev;
lmc_proto_netif(sc, skb);
@@ -1706,7 +1706,7 @@ static int lmc_rx (struct net_device *dev) /*fold00*/
nsb->protocol = lmc_proto_type(sc, skb);
skb_reset_mac_header(nsb);
// nsb->nh.raw = nsb->data;
/* skb_reset_network_header(nsb); */
nsb->dev = dev;
lmc_proto_netif(sc, nsb);
}
drivers/net/wireless/hostap/hostap_80211_rx.c
+2 -2
View File
@@ -1076,8 +1076,8 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
skb2->dev = dev;
skb2->protocol = __constant_htons(ETH_P_802_3);
skb_reset_mac_header(skb2);
skb2->nh.raw = skb2->data;
/* skb2->nh.raw = skb2->data + ETH_HLEN; */
skb_reset_network_header(skb2);
/* skb2->nh.raw += ETH_HLEN; */
dev_queue_xmit(skb2);
}
drivers/net/wireless/hostap/hostap_ap.c
+1 -1
View File
@@ -983,7 +983,7 @@ static void prism2_send_mgmt(struct net_device *dev,
skb->dev = dev;
skb_reset_mac_header(skb);
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
dev_queue_xmit(skb);
}
#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
drivers/net/wireless/hostap/hostap_main.c
+1 -1
View File
@@ -1064,7 +1064,7 @@ int prism2_sta_send_mgmt(local_info_t *local, u8 *dst, u16 stype,
skb->dev = dev;
skb_reset_mac_header(skb);
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
dev_queue_xmit(skb);
return 0;
include/linux/skbuff.h
+5
View File
@@ -960,6 +960,11 @@ static inline void skb_reserve(struct sk_buff *skb, int len)
skb->tail += len;
}
static inline void skb_reset_network_header(struct sk_buff *skb)
{
skb->nh.raw = skb->data;
}
static inline unsigned char *skb_mac_header(const struct sk_buff *skb)
{
return skb->mac.raw;
include/net/llc_pdu.h
+1 -1
View File
@@ -235,7 +235,7 @@ static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type,
struct llc_pdu_un *pdu;
skb_push(skb, hlen);
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
pdu = llc_pdu_un_hdr(skb);
pdu->dsap = dsap;
pdu->ssap = ssap;
net/appletalk/aarp.c
+1 -1
View File
@@ -539,7 +539,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,
int hash;
struct aarp_entry *a;
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
/* Check for LocalTalk first */
if (dev->type == ARPHRD_LOCALTLK) {
net/atm/mpc.c
+1 -1
View File
@@ -713,7 +713,7 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb)
skb_push(new_skb, eg->ctrl_info.DH_length); /* add MAC header */
memcpy(new_skb->data, eg->ctrl_info.DLL_header, eg->ctrl_info.DH_length);
new_skb->protocol = eth_type_trans(new_skb, dev);
new_skb->nh.raw = new_skb->data;
skb_reset_network_header(new_skb);
eg->latest_ip_addr = new_skb->nh.iph->saddr;
eg->packets_rcvd++;
net/ax25/af_ax25.c
+1 -1
View File
@@ -1548,7 +1548,7 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock,
goto out;
}
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
/* Add the PID if one is not supplied by the user in the skb */
if (!ax25->pidincl) {
net/ax25/ax25_ds_subr.c
+1 -1
View File
@@ -136,7 +136,7 @@ static void ax25_kiss_cmd(ax25_dev *ax25_dev, unsigned char cmd, unsigned char p
if ((skb = alloc_skb(2, GFP_ATOMIC)) == NULL)
return;
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
p = skb_put(skb, 2);
*p++ = cmd;
net/ax25/ax25_in.c
+4 -4
View File
@@ -61,8 +61,8 @@ static int ax25_rx_fragment(ax25_cb *ax25, struct sk_buff *skb)
skb_reserve(skbn, AX25_MAX_HEADER_LEN);
skbn->dev = ax25->ax25_dev->dev;
skb_reset_network_header(skbn);
skbn->h.raw = skbn->data;
skbn->nh.raw = skbn->data;
/* Copy data from the fragments */
while ((skbo = skb_dequeue(&ax25->frag_queue)) != NULL) {
@@ -123,7 +123,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb)
skb_pull(skb, 1); /* Remove PID */
skb_reset_mac_header(skb);
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
skb->dev = ax25->ax25_dev->dev;
skb->pkt_type = PACKET_HOST;
skb->protocol = htons(ETH_P_IP);
@@ -247,7 +247,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
case AX25_P_IP:
skb_pull(skb,2); /* drop PID/CTRL */
skb->h.raw = skb->data;
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
skb->dev = dev;
skb->pkt_type = PACKET_HOST;
skb->protocol = htons(ETH_P_IP);
@@ -257,7 +257,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
case AX25_P_ARP:
skb_pull(skb,2);
skb->h.raw = skb->data;
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
skb->dev = dev;
skb->pkt_type = PACKET_HOST;
skb->protocol = htons(ETH_P_ARP);
net/ax25/ax25_ip.c
+1 -1
View File
@@ -171,7 +171,7 @@ int ax25_rebuild_header(struct sk_buff *skb)
src_c = *(ax25_address *)(bp + 8);
skb_pull(ourskb, AX25_HEADER_LEN - 1); /* Keep PID */
ourskb->nh.raw = ourskb->data;
skb_reset_network_header(ourskb);
ax25=ax25_send_frame(
ourskb,
net/ax25/ax25_out.c
+1 -1
View File
@@ -205,7 +205,7 @@ static void ax25_send_iframe(ax25_cb *ax25, struct sk_buff *skb, int poll_bit)
if (skb == NULL)
return;
skb->nh.raw = skb->data;
skb_reset_network_header(skb);
if (ax25->modulus == AX25_MODULUS) {
frame = skb_push(skb, 1);

Some files were not shown because too many files have changed in this diff Show More