Commit 411ee44a authored by Brett Rudley's avatar Brett Rudley Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: move fullmac-only code from osl to fullmac files 



Signed-off-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ec795704

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+9 −0
Original line number Diff line number Diff line
@@ -298,6 +298,15 @@ dhd_prot_ioctl(dhd_pub_t *dhd, int ifidx, wl_ioctl_t *ioc, void *buf, int len) 
	return ret;

}



#define PKTSUMNEEDED(skb) \

		(((struct sk_buff *)(skb))->ip_summed == CHECKSUM_PARTIAL)

#define PKTSETSUMGOOD(skb, x) \

		(((struct sk_buff *)(skb))->ip_summed = \

		((x) ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE))



/* PKTSETSUMNEEDED and PKTSUMGOOD are not possible because

	skb->ip_summed is overloaded */



int

dhd_prot_iovar_op(dhd_pub_t *dhdp, const char *name,

		  void *params, int plen, void *arg, int len, bool set)

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+26 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,32 @@ int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, struct sk_buff *pktbuf) 
	return ret;

}



static inline void *

osl_pkt_frmnative(struct osl_info *osh, struct sk_buff *skb)

{

	struct sk_buff *nskb;



	for (nskb = skb; nskb; nskb = nskb->next)

		osh->pktalloced++;



	return (void *)skb;

}

#define PKTFRMNATIVE(osh, skb)	\

	osl_pkt_frmnative((osh), (struct sk_buff *)(skb))



static inline struct sk_buff *

osl_pkt_tonative(struct osl_info *osh, void *pkt)

{

	struct sk_buff *nskb;



	for (nskb = (struct sk_buff *)pkt; nskb; nskb = nskb->next)

		osh->pktalloced--;



	return (struct sk_buff *)pkt;

}

#define PKTTONATIVE(osh, pkt)	\

	osl_pkt_tonative((osh), (pkt))



static int dhd_start_xmit(struct sk_buff *skb, struct net_device *net)

{

	int ret;

drivers/staging/brcm80211/include/osl.h

+0 −37
Original line number Diff line number Diff line
@@ -249,43 +249,6 @@ extern void osl_dma_unmap(struct osl_info *osh, uint pa, uint size, 
extern void *osl_pktget(struct osl_info *osh, uint len);

extern void osl_pktfree(struct osl_info *osh, void *skb, bool send);



#ifdef BRCM_FULLMAC

static inline void *

osl_pkt_frmnative(struct osl_info *osh, struct sk_buff *skb)

{

	struct sk_buff *nskb;



	for (nskb = skb; nskb; nskb = nskb->next)

		osh->pktalloced++;



	return (void *)skb;

}

#define PKTFRMNATIVE(osh, skb)	\

	osl_pkt_frmnative((osh), (struct sk_buff *)(skb))



static inline struct sk_buff *

osl_pkt_tonative(struct osl_info *osh, void *pkt)

{

	struct sk_buff *nskb;



	for (nskb = (struct sk_buff *)pkt; nskb; nskb = nskb->next)

		osh->pktalloced--;



	return (struct sk_buff *)pkt;

}

#define PKTTONATIVE(osh, pkt)	\

	osl_pkt_tonative((osh), (pkt))

#endif	/* BRCM_FULLMAC */



#define PKTSUMNEEDED(skb) \

		(((struct sk_buff *)(skb))->ip_summed == CHECKSUM_PARTIAL)

#define PKTSETSUMGOOD(skb, x) \

		(((struct sk_buff *)(skb))->ip_summed = \

			((x) ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE))

/* PKTSETSUMNEEDED and PKTSUMGOOD are not possible because

	skb->ip_summed is overloaded */





#define	SET_REG(osh, r, mask, val) \

		W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))