[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel telos_ap.c, 1.4, 1.5

[steve ayer]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22403

Modified Files:
	telos_ap.c 
Log Message:

added kernel version check in telos_bump to handle modified sk_buff
struct.  mac field no longer union {unsigned char * raw; } from 2.6.22 forward;
it's now unsigned char * mac_header;


Index: telos_ap.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel/telos_ap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** telos_ap.c	23 Feb 2007 17:14:34 -0000	1.4
--- telos_ap.c	11 Jul 2007 15:49:05 -0000	1.5
***************
*** 348,352 ****
--- 348,357 ----
  		skb->dev = telos->dev;
  		memcpy(skb_put(skb,count - 1), telos->rbuff + 1, count - 1);
+ 
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,21)		
+ 		skb->mac_header=skb->data;
+ #else		
  		skb->mac.raw=skb->data;
+ #endif
  		skb->protocol=htons(ETH_P_IP);
  		netif_rx(skb);