git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
error: Duplicate Url entries in package: (main package)
[linux-2.6.git]
/
linux-2.6-525-sknid-elevator.patch
diff --git
a/linux-2.6-525-sknid-elevator.patch
b/linux-2.6-525-sknid-elevator.patch
index
87d88fc
..
a551454
100644
(file)
--- a/
linux-2.6-525-sknid-elevator.patch
+++ b/
linux-2.6-525-sknid-elevator.patch
@@
-1,9
+1,3
@@
-commit a57d715bc58005cfae0fdf1626ebf11b11508025
-Author: root <root@rhel6.(none)>
-Date: Thu Apr 29 10:01:21 2010 -0400
-
- linux-2.6-525-sknid-elevator.patch
-
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 4267c8b..3f36a91 100644
--- a/include/linux/netdevice.h
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 4267c8b..3f36a91 100644
--- a/include/linux/netdevice.h
@@
-104,7
+98,7
@@
index 1bd109e..5c2e9ad 100644
static const struct proto_ops packet_ops_spkt;
static const struct proto_ops packet_ops_spkt;
-+
extern DEFIN
E_PER_CPU(int, sknid_elevator);
++
DECLAR
E_PER_CPU(int, sknid_elevator);
+
+static inline unsigned int slice_check_and_elevate(struct sk_buff *skb, struct sock *sk) {
+ /* This mechanism is quite involved, and caused us a lot of pain
+
+static inline unsigned int slice_check_and_elevate(struct sk_buff *skb, struct sock *sk) {
+ /* This mechanism is quite involved, and caused us a lot of pain