Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98e399f8 authored Mar 19, 2007 by Arnaldo Carvalho de Melo Committed by David S. Miller Apr 25, 2007

[SK_BUFF]: Introduce skb_mac_header()



For the places where we need a pointer to the mac header, it is still legal to
touch skb->mac.raw directly if just adding to, subtracting from or setting it
to another layer header.

This one also converts some more cases to skb_reset_mac_header() that my
regex missed as it had no spaces before nor after '=', ugh.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 31713c33

arch/um/drivers/daemon_kern.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ static int daemon_read(int fd, struct sk_buff **skb,
		{
		skb = ether_adjust_skb(skb, ETH_HEADER_OTHER);
		if(*skb == NULL) return(-ENOMEM);
		return(net_recvfrom(fd, (*skb)->mac.raw,
		return(net_recvfrom(fd, skb_mac_header(*skb),
		(*skb)->dev->mtu + ETH_HEADER_OTHER));
		}

arch/um/drivers/mcast_kern.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ static int mcast_read(int fd, struct sk_buff *skb, struct uml_net_private lp)
		{
		skb = ether_adjust_skb(skb, ETH_HEADER_OTHER);
		if(*skb == NULL) return(-ENOMEM);
		return(net_recvfrom(fd, (*skb)->mac.raw,
		return(net_recvfrom(fd, skb_mac_header(*skb),
		(*skb)->dev->mtu + ETH_HEADER_OTHER));
		}

arch/um/drivers/pcap_kern.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ static int pcap_read(int fd, struct sk_buff **skb,
		{
		skb = ether_adjust_skb(skb, ETH_HEADER_OTHER);
		if(*skb == NULL) return(-ENOMEM);
		return(pcap_user_read(fd, (*skb)->mac.raw,
		return(pcap_user_read(fd, skb_mac_header(*skb),
		(*skb)->dev->mtu + ETH_HEADER_OTHER,
		(struct pcap_data *) &lp->user));
		}

arch/um/drivers/slip_kern.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ static unsigned short slip_protocol(struct sk_buff *skbuff)
		static int slip_read(int fd, struct sk_buff **skb,
		struct uml_net_private *lp)
		{
		return(slip_user_read(fd, (skb)->mac.raw, (skb)->dev->mtu,
		return(slip_user_read(fd, skb_mac_header(skb), (skb)->dev->mtu,
		(struct slip_data *) &lp->user));
		}

arch/um/drivers/slirp_kern.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ static unsigned short slirp_protocol(struct sk_buff *skbuff)
		static int slirp_read(int fd, struct sk_buff **skb,
		struct uml_net_private *lp)
		{
		return(slirp_user_read(fd, (skb)->mac.raw, (skb)->dev->mtu,
		return(slirp_user_read(fd, skb_mac_header(skb), (skb)->dev->mtu,
		(struct slirp_data *) &lp->user));
		}