]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/compat-wireless-2.6.34-xen.patch
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
[ipfire-2.x.git] / src / patches / compat-wireless-2.6.34-xen.patch
1 diff -Naur compat-wireless-2.6.34.org/include/linux/compat-2.6.33.h compat-wireless-2.6.34/include/linux/compat-2.6.33.h
2 --- compat-wireless-2.6.34.org/include/linux/compat-2.6.33.h 2010-05-18 03:11:59.000000000 +0200
3 +++ compat-wireless-2.6.34/include/linux/compat-2.6.33.h 2010-05-27 19:58:55.000000000 +0200
4 @@ -60,16 +60,6 @@
5 /* this will never happen on older kernels */
6 #define NETDEV_POST_INIT 0xffff
7
8 -static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
9 - unsigned int length)
10 -{
11 - struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN);
12 -
13 - if (NET_IP_ALIGN && skb)
14 - skb_reserve(skb, NET_IP_ALIGN);
15 - return skb;
16 -}
17 -
18 #if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
19
20 #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)