diff options
| -rw-r--r-- | kernel/2.6.26_compat.patch | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/kernel/2.6.26_compat.patch b/kernel/2.6.26_compat.patch index 641d2f6..a8eea3a 100644 --- a/kernel/2.6.26_compat.patch +++ b/kernel/2.6.26_compat.patch @@ -1,5 +1,5 @@ diff --git a/libiscsi.c b/libiscsi.c -index 149d5eb..467abbf 100644 +index 0b810b6..6ffb49c 100644 --- a/libiscsi.c +++ b/libiscsi.c @@ -38,6 +38,8 @@ @@ -46,7 +46,7 @@ index 0000000..b977df5 + +#endif diff --git a/scsi_transport_iscsi.c b/scsi_transport_iscsi.c -index a49a92c..c07535e 100644 +index f64ffa7..c6eeae0 100644 --- a/scsi_transport_iscsi.c +++ b/scsi_transport_iscsi.c @@ -30,6 +30,8 @@ @@ -55,10 +55,10 @@ index a49a92c..c07535e 100644 +#include "open_iscsi_compat.h" + - #define ISCSI_SESSION_ATTRS 21 + #define ISCSI_SESSION_ATTRS 22 #define ISCSI_CONN_ATTRS 13 #define ISCSI_HOST_ATTRS 4 -@@ -113,6 +115,7 @@ static struct attribute_group iscsi_transport_group = { +@@ -144,6 +146,7 @@ static struct attribute_group iscsi_transport_group = { .attrs = iscsi_transport_attrs, }; @@ -66,7 +66,7 @@ index a49a92c..c07535e 100644 /* * iSCSI endpoint attrs */ -@@ -236,6 +239,7 @@ struct iscsi_endpoint *iscsi_lookup_endpoint(u64 handle) +@@ -267,6 +270,7 @@ struct iscsi_endpoint *iscsi_lookup_endpoint(u64 handle) return ep; } EXPORT_SYMBOL_GPL(iscsi_lookup_endpoint); @@ -74,7 +74,7 @@ index a49a92c..c07535e 100644 static int iscsi_setup_host(struct transport_container *tc, struct device *dev, struct device *cdev) -@@ -1309,6 +1313,8 @@ static int +@@ -1401,6 +1405,8 @@ static int iscsi_if_transport_ep(struct iscsi_transport *transport, struct iscsi_uevent *ev, int msg_type) { @@ -83,7 +83,7 @@ index a49a92c..c07535e 100644 struct iscsi_endpoint *ep; int rc = 0; -@@ -1340,6 +1346,8 @@ iscsi_if_transport_ep(struct iscsi_transport *transport, +@@ -1432,6 +1438,8 @@ iscsi_if_transport_ep(struct iscsi_transport *transport, break; } return rc; @@ -92,7 +92,7 @@ index a49a92c..c07535e 100644 } static int -@@ -1421,6 +1429,9 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) +@@ -1540,6 +1548,9 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) ev->u.c_session.queue_depth); break; case ISCSI_UEVENT_CREATE_BOUND_SESSION: @@ -102,7 +102,7 @@ index a49a92c..c07535e 100644 ep = iscsi_lookup_endpoint(ev->u.c_bound_session.ep_handle); if (!ep) { err = -EINVAL; -@@ -1432,6 +1443,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) +@@ -1551,6 +1562,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) ev->u.c_bound_session.cmds_max, ev->u.c_bound_session.queue_depth); break; @@ -110,7 +110,7 @@ index a49a92c..c07535e 100644 case ISCSI_UEVENT_DESTROY_SESSION: session = iscsi_session_lookup(ev->u.d_session.sid); if (session) -@@ -1945,13 +1957,14 @@ static __init int iscsi_transport_init(void) +@@ -2068,13 +2080,14 @@ static __init int iscsi_transport_init(void) if (err) return err; @@ -127,7 +127,7 @@ index a49a92c..c07535e 100644 err = transport_class_register(&iscsi_connection_class); if (err) -@@ -1982,8 +1995,10 @@ unregister_conn_class: +@@ -2105,8 +2118,10 @@ unregister_conn_class: transport_class_unregister(&iscsi_connection_class); unregister_host_class: transport_class_unregister(&iscsi_host_class); @@ -138,7 +138,7 @@ index a49a92c..c07535e 100644 unregister_transport_class: class_unregister(&iscsi_transport_class); return err; -@@ -1996,7 +2011,9 @@ static void __exit iscsi_transport_exit(void) +@@ -2119,7 +2134,9 @@ static void __exit iscsi_transport_exit(void) transport_class_unregister(&iscsi_connection_class); transport_class_unregister(&iscsi_session_class); transport_class_unregister(&iscsi_host_class); @@ -148,6 +148,3 @@ index a49a92c..c07535e 100644 class_unregister(&iscsi_transport_class); } --- -1.5.2.1 - |