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

Commit abdbf94d authored by Ed L. Cashin's avatar Ed L. Cashin Committed by Linus Torvalds
Browse files

aoe: remove unecessary wrapper function 



We can just use skb_mac_header now, and we don't need a wrapper function to
perform the cast.  Instead of requiring the reader to check aoe.h to look
up what an aoe_hdr function does, I'd rather do without it.

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7c9e69fa

drivers/block/aoe/aoe.h

+0 −9
Original line number Diff line number Diff line
@@ -48,15 +48,6 @@ struct aoe_hdr { 
	__be32 tag;

};



#ifdef __KERNEL__

#include <linux/skbuff.h>



static inline struct aoe_hdr *aoe_hdr(const struct sk_buff *skb)

{

	return (struct aoe_hdr *)skb_mac_header(skb);

}

#endif



struct aoe_atahdr {

	unsigned char aflags;

	unsigned char errfeat;

drivers/block/aoe/aoecmd.c

+7 −7
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ aoecmd_ata_rw(struct aoedev *d, struct frame *f) 


	/* initialize the headers & frame */

	skb = f->skb;

	h = aoe_hdr(skb);

	h = (struct aoe_hdr *) skb_mac_header(skb);

	ah = (struct aoe_atahdr *) (h+1);

	skb_put(skb, sizeof *h + sizeof *ah);

	memset(h, 0, skb->len);
@@ -209,7 +209,7 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail) 
		skb->dev = ifp;

		if (sl_tail == NULL)

			sl_tail = skb;

		h = aoe_hdr(skb);

		h = (struct aoe_hdr *) skb_mac_header(skb);

		memset(h, 0, sizeof *h + sizeof *ch);



		memset(h->dst, 0xff, sizeof h->dst);
@@ -304,7 +304,7 @@ rexmit(struct aoedev *d, struct frame *f) 
	aoechr_error(buf);



	skb = f->skb;

	h = aoe_hdr(skb);

	h = (struct aoe_hdr *) skb_mac_header(skb);

	ah = (struct aoe_atahdr *) (h+1);

	f->tag = n;

	h->tag = cpu_to_be32(n);
@@ -533,7 +533,7 @@ aoecmd_ata_rsp(struct sk_buff *skb) 
	char ebuf[128];

	u16 aoemajor;



	hin = aoe_hdr(skb);

	hin = (struct aoe_hdr *) skb_mac_header(skb);

	aoemajor = be16_to_cpu(get_unaligned(&hin->major));

	d = aoedev_by_aoeaddr(aoemajor, hin->minor);

	if (d == NULL) {
@@ -565,7 +565,7 @@ aoecmd_ata_rsp(struct sk_buff *skb) 
	calc_rttavg(d, tsince(f->tag));



	ahin = (struct aoe_atahdr *) (hin+1);

	hout = aoe_hdr(f->skb);

	hout = (struct aoe_hdr *) skb_mac_header(f->skb);

	ahout = (struct aoe_atahdr *) (hout+1);

	buf = f->buf;
@@ -699,7 +699,7 @@ aoecmd_ata_id(struct aoedev *d) 


	/* initialize the headers & frame */

	skb = f->skb;

	h = aoe_hdr(skb);

	h = (struct aoe_hdr *) skb_mac_header(skb);

	ah = (struct aoe_atahdr *) (h+1);

	skb_put(skb, sizeof *h + sizeof *ah);

	memset(h, 0, skb->len);
@@ -730,7 +730,7 @@ aoecmd_cfg_rsp(struct sk_buff *skb) 
	enum { MAXFRAMES = 16 };

	u16 n;



	h = aoe_hdr(skb);

	h = (struct aoe_hdr *) skb_mac_header(skb);

	ch = (struct aoe_cfghdr *) (h+1);



	/*

drivers/block/aoe/aoenet.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, 
		goto exit;

	skb_push(skb, ETH_HLEN);	/* (1) */



	h = aoe_hdr(skb);

	h = (struct aoe_hdr *) skb_mac_header(skb);

	n = be32_to_cpu(get_unaligned(&h->tag));

	if ((h->verfl & AOEFL_RSP) == 0 || (n & 1<<31))

		goto exit;