diff --git a/iscsi-initiator-utils-add-rh-ver.patch b/iscsi-initiator-utils-add-rh-ver.patch index 7f7670a..2a6d8f3 100644 --- a/iscsi-initiator-utils-add-rh-ver.patch +++ b/iscsi-initiator-utils-add-rh-ver.patch @@ -5,7 +5,7 @@ * some other maintainer could merge a patch without going through us */ -#define ISCSI_VERSION_STR "2.0-872" -+#define ISCSI_VERSION_STR "2.0-872.40.el6" ++#define ISCSI_VERSION_STR "2.0-872.41.el6" #define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version" #endif diff --git a/iscsi-initiator-utils-mod-iface-andport-fixes.patch b/iscsi-initiator-utils-mod-iface-andport-fixes.patch index 8945bd2..44f281c 100644 --- a/iscsi-initiator-utils-mod-iface-andport-fixes.patch +++ b/iscsi-initiator-utils-mod-iface-andport-fixes.patch @@ -1,6 +1,6 @@ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h ---- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h +--- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h 2012-04-05 16:04:06.000000000 -0500 @@ -270,7 +270,8 @@ struct iscsi_uevent { } host_event; struct msg_ping_comp { @@ -32,9 +32,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h open-iscsi-2.0-872-r #define iscsi_ptr(_handle) ((void*)(unsigned long)_handle) #define iscsi_handle(_ptr) ((uint64_t)(unsigned long)_ptr) -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h ---- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h +--- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h 2012-04-05 16:04:06.000000000 -0500 @@ -7,5 +7,6 @@ extern int net_get_transport_name_from_n extern int net_get_netdev_from_hwaddress(char *hwaddress, char *netdev); extern int net_setup_netdev(char *netdev, char *local_ip, char *mask, @@ -42,9 +42,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h open-iscsi-2.0 +extern int net_ifup_netdev(char *netdev); #endif -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h ---- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h +--- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h 2012-04-05 16:04:06.000000000 -0500 @@ -59,6 +59,9 @@ typedef struct iface_rec { * 1 = enable */ uint16_t mtu; @@ -55,9 +55,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2. /* * TODO: we may have to make this bigger and interconnect * specific for infinniband -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c ---- open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c +--- open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c 2012-04-05 16:04:06.000000000 -0500 @@ -626,12 +626,15 @@ int libiscsi_node_set_parameter(struct l const char *parameter, const char *value) { @@ -79,9 +79,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872- (char *)node->name, node->tpgt, (char *)node->address, node->port)) if (nr_found == 0) { -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/config.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h ---- open-iscsi-2.0-872-rc4-bnx2i/usr/config.h 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/config.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h +--- open-iscsi-2.0-872-rc4-bnx2i/usr/config.h 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h 2012-04-05 16:04:06.000000000 -0500 @@ -229,6 +229,8 @@ typedef struct iface_rec { * 1 = enable */ uint16_t mtu; @@ -91,9 +91,21 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/config.h open-iscsi-2.0-872-rc4-bnx /* * TODO: we may have to make this bigger and interconnect * specific for infinniband -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/host.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/host.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/discovery.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/discovery.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/discovery.c 2012-04-05 16:03:05.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/discovery.c 2012-04-05 16:04:20.000000000 -0500 +@@ -849,7 +849,7 @@ iscsi_alloc_session(struct iscsi_sendtar + session->isid[4] = 0; + session->isid[5] = 0; + +- if (iface && strlen(iface->iname)) { ++ if (strlen(iface->iname)) { + strcpy(initiator_name, iface->iname); + /* MNC TODO add iface alias */ + } else { +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/host.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/host.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c 2012-04-05 16:04:06.000000000 -0500 @@ -174,6 +174,16 @@ static int print_host_iface(void *data, iface->ipv6_router); } @@ -119,9 +131,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/host.c open-iscsi-2.0-872-rc4-bnx2i err = iscsi_sysfs_for_each_host(&flags, &num_found, host_info_print_tree); break; -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c 2012-04-04 20:58:47.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c 2012-04-05 16:04:06.000000000 -0500 @@ -608,6 +608,7 @@ setup_passwd_len: for (i=0; i #include "initiator.h" @@ -313,9 +325,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc4-bnx2i extern void idbm_node_setup_defaults(node_rec_t *rec); extern struct node_rec *idbm_find_rec_in_list(struct list_head *rec_list, char *targetname, char *addr, -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c 2012-04-05 16:04:06.000000000 -0500 @@ -169,7 +169,7 @@ free_conf: int iface_conf_read(struct iface_rec *iface) { @@ -452,9 +464,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c open-iscsi-2.0-872-rc4-bnx2 if (!t) { log_error("Could not get transport for host%u. " "Make sure the iSCSI driver is loaded.", -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h 2012-04-05 16:04:06.000000000 -0500 @@ -26,7 +26,6 @@ struct iface_rec; @@ -472,9 +484,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h open-iscsi-2.0-872-rc4-bnx2 struct iface_rec *iface); extern int iface_conf_write(struct iface_rec *iface); extern int iface_conf_delete(struct iface_rec *iface); -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c 2012-04-05 16:04:06.000000000 -0500 @@ -35,6 +35,7 @@ #include "host.h" #include "sysdeps.h" @@ -514,9 +526,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c open-iscsi-2.0-8 rc = iscsi_set_net_config(t, session, iface); if (rc != 0) return rc; -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c 2012-04-05 16:04:06.000000000 -0500 @@ -110,6 +110,7 @@ static struct option const long_options[ {"ip", required_argument, NULL, 'a'}, {"packetsize", required_argument, NULL, 'b'}, @@ -986,9 +998,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c open-iscsi-2.0-872-rc4-b goto out; } -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c 2012-04-05 16:04:06.000000000 -0500 @@ -409,11 +409,6 @@ int main(int argc, char *argv[]) exit(ISCSI_ERR); } @@ -1001,9 +1013,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c open-iscsi-2.0-872-rc4-bnx umask(0177); mgmt_ipc_fd = -1; -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h 2012-04-05 16:04:06.000000000 -0500 @@ -137,7 +137,7 @@ struct iscsi_ipc { int (*exec_ping) (uint64_t transport_handle, uint32_t host_no, @@ -1013,9 +1025,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h open-iscsi-2.0-872-rc4- int (*get_chap) (uint64_t transport_handle, uint32_t host_no, uint16_t chap_tbl_idx, uint32_t num_entries, -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c 2012-04-05 16:04:24.000000000 -0500 @@ -72,7 +72,7 @@ int net_get_transport_name_from_netdev(c ifr.ifr_data = (caddr_t)&drvinfo; err = ioctl(fd, SIOCETHTOOL, &ifr); @@ -1025,6 +1037,33 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872 err = errno; goto close_sock; } +@@ -228,7 +228,7 @@ int net_setup_netdev(char *netdev, char + + /* Bring up interface */ + memset(&ifr, 0, sizeof(ifr)); +- strncpy(ifr.ifr_name, netdev, IFNAMSIZ); ++ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ); + ifr.ifr_flags = IFF_UP | IFF_RUNNING; + if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) { + log_error("Could not bring up netdev %s (err %d - %s)", +@@ -238,7 +238,7 @@ int net_setup_netdev(char *netdev, char + } + /* Set IP address */ + memset(&ifr, 0, sizeof(ifr)); +- strncpy(ifr.ifr_name, netdev, IFNAMSIZ); ++ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ); + memcpy(&ifr.ifr_addr, &sk_ipaddr, sizeof(struct sockaddr)); + if (ioctl(sock, SIOCSIFADDR, &ifr) < 0) { + log_error("Could not set ip for %s (err %d - %s)", +@@ -249,7 +249,7 @@ int net_setup_netdev(char *netdev, char + + /* Set netmask */ + memset(&ifr, 0, sizeof(ifr)); +- strncpy(ifr.ifr_name, netdev, IFNAMSIZ); ++ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ); + memcpy(&ifr.ifr_addr, &sk_netmask, sizeof(struct sockaddr)); + if (ioctl(sock, SIOCSIFNETMASK, &ifr) < 0) { + log_error("Could not set ip for %s (err %d - %s)", @@ -304,6 +304,59 @@ int net_setup_netdev(char *netdev, char done: close(sock); @@ -1054,7 +1093,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872 + } + + memset(&ifr, 0, sizeof(ifr)); -+ strncpy(ifr.ifr_name, netdev, IFNAMSIZ); ++ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ); + if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) { + log_error("Could not bring up netdev %s (err %d - %s)", + netdev, errno, strerror(errno)); @@ -1071,7 +1110,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872 + + /* Bring up interface */ + memset(&ifr, 0, sizeof(ifr)); -+ strncpy(ifr.ifr_name, netdev, IFNAMSIZ); ++ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ); + ifr.ifr_flags = IFF_UP; + if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) { + log_error("Could not bring up netdev %s (err %d - %s)", @@ -1085,9 +1124,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872 } -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c 2012-04-05 16:04:06.000000000 -0500 @@ -40,6 +40,7 @@ #include "log.h" #include "iscsi_util.h" @@ -1224,9 +1263,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c open-iscsi-2.0-872-rc4 if (err) exit(err); break; -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c 2012-04-05 16:04:06.000000000 -0500 @@ -532,6 +532,12 @@ static int iscsi_sysfs_read_iface(struct ret = 0; } @@ -1329,9 +1368,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c open-iscsi-2.0-872-rc - ISCSI_VERSION_FILE); - return -1; -} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h 2012-04-05 16:04:06.000000000 -0500 @@ -36,7 +36,6 @@ struct iscsi_auth_config; extern void free_transports(void); @@ -1348,9 +1387,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h open-iscsi-2.0-872-rc extern int iscsi_sysfs_session_supports_nop(int sid); extern int iscsi_sysfs_session_user_created(int sid); -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c 2012-04-05 16:04:06.000000000 -0500 @@ -90,13 +90,24 @@ str_to_ipport(char *str, int *port, int if (!strchr(ip, '.')) { @@ -1394,9 +1433,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4 if ((f = fopen(pathname, "r"))) { while ((line = fgets(buffer, sizeof (buffer), f))) { param = strstr(line, key); -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile ---- open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile +--- open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile 2012-04-05 16:04:06.000000000 -0500 @@ -33,7 +33,7 @@ endif OPTFLAGS ?= -O2 -g WARNFLAGS ?= -Wall -Wstrict-prototypes @@ -1415,9 +1454,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile open-iscsi-2.0-872-rc4-bnx iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c 2012-04-05 16:04:06.000000000 -0500 @@ -1085,13 +1085,15 @@ ksend_ping(uint64_t transport_handle, ui static int kexec_ping(uint64_t transport_handle, uint32_t host_no, @@ -1448,9 +1487,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c open-iscsi-2.0-872-rc4-bn break; } -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c ---- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c +--- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c 2012-04-05 16:04:16.000000000 -0500 @@ -19,7 +19,17 @@ #include #include @@ -1469,7 +1508,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4- #include "initiator.h" #include "transport.h" #include "log.h" -@@ -100,6 +110,151 @@ static struct iscsi_transport_template * +@@ -100,6 +110,152 @@ static struct iscsi_transport_template * NULL }; @@ -1513,6 +1552,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4- + + transport_load_kmod(transport_name); + } ++ close(sockfd); + +free_ifni: + if_freenameindex(ifni); @@ -1621,9 +1661,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4- int set_transport_template(struct iscsi_transport *t) { struct iscsi_transport_template *tmpl; -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h ---- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h +--- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h 2012-04-05 16:04:06.000000000 -0500 @@ -51,5 +51,7 @@ struct iscsi_transport { }; @@ -1632,9 +1672,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h open-iscsi-2.0-872-rc4- +extern int transport_probe_for_offload(void); #endif -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c ---- open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c 2012-04-04 20:58:29.000000000 -0500 -+++ open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c 2012-04-04 20:58:40.000000000 -0500 +diff -aurp open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c +--- open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c 2012-04-05 16:03:19.000000000 -0500 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c 2012-04-05 16:04:06.000000000 -0500 @@ -35,6 +35,8 @@ #include "idbm_fields.h" #include "iscsi_net_util.h" diff --git a/iscsi-initiator-utils-sync-uio-0.7.2.1.patch b/iscsi-initiator-utils-sync-uio-0.7.2.1.patch index b95600e..d707851 100644 --- a/iscsi-initiator-utils-sync-uio-0.7.2.1.patch +++ b/iscsi-initiator-utils-sync-uio-0.7.2.1.patch @@ -1,6 +1,6 @@ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/aclocal.m4 open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/aclocal.m4 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/aclocal.m4 open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/aclocal.m4 --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/aclocal.m4 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/aclocal.m4 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/aclocal.m4 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,7277 @@ +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- + @@ -7279,9 +7279,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/aclocal.m4 open-iscsi-2.0-872- +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/ChangeLog open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/ChangeLog +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/ChangeLog open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/ChangeLog --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/ChangeLog 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/ChangeLog 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/ChangeLog 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,7 @@ +Version 0.4.1 (July 20, 2009) + * Fix from Mike Christie to determine page size from getpagesize() @@ -7290,9 +7290,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/ChangeLog open-iscsi-2.0-872-r + * Update documentation to indicate IPv6 is not supported + * Fix code to catch the message from the CNIC that the network + interface is going down. -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/compile open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/compile +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/compile open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/compile --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/compile 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/compile 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/compile 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,142 @@ +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. @@ -7436,9 +7436,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/compile open-iscsi-2.0-872-rc4 +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.guess open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/config.guess +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.guess open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/config.guess --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.guess 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/config.guess 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/config.guess 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,1548 @@ +#! /bin/sh +# Attempt to guess a canonical system name. @@ -8988,9 +8988,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.guess open-iscsi-2.0-87 +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.h.in open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/config.h.in +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.h.in open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/config.h.in --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.h.in 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/config.h.in 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/config.h.in 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,111 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + @@ -9103,9 +9103,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.h.in open-iscsi-2.0-872 + +/* Define to `unsigned' if does not define. */ +#undef size_t -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.sub open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/config.sub +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.sub open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/config.sub --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.sub 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/config.sub 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/config.sub 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,1695 @@ +#! /bin/sh +# Configuration validation subroutine script. @@ -10802,13 +10802,13 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/config.sub open-iscsi-2.0-872- +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/configure +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/configure --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/configure 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/configure 2012-04-09 21:53:58.000000000 -0500 @@ -0,0 +1,22786 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. -+# Generated by GNU Autoconf 2.59 for iscsiuio 0.7.0.14. ++# Generated by GNU Autoconf 2.59 for iscsiuio 0.7.2.1. +# +# Report bugs to . +# @@ -11231,8 +11231,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure open-iscsi-2.0-872-r +# Identity of this package. +PACKAGE_NAME='iscsiuio' +PACKAGE_TARNAME='iscsiuio' -+PACKAGE_VERSION='0.7.0.14' -+PACKAGE_STRING='iscsiuio 0.7.0.14' ++PACKAGE_VERSION='0.7.2.1' ++PACKAGE_STRING='iscsiuio 0.7.2.1' +PACKAGE_BUGREPORT='eddie.wai@broadcom.com' + +# Factoring default headers for most tests. @@ -11762,7 +11762,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure open-iscsi-2.0-872-r + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF -+\`configure' configures iscsiuio 0.7.0.14 to adapt to many kinds of systems. ++\`configure' configures iscsiuio 0.7.2.1 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + @@ -11828,7 +11828,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure open-iscsi-2.0-872-r + +if test -n "$ac_init_help"; then + case $ac_init_help in -+ short | recursive ) echo "Configuration of iscsiuio 0.7.0.14:";; ++ short | recursive ) echo "Configuration of iscsiuio 0.7.2.1:";; + esac + cat <<\_ACEOF + @@ -11969,7 +11969,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure open-iscsi-2.0-872-r +test -n "$ac_init_help" && exit 0 +if $ac_init_version; then + cat <<\_ACEOF -+iscsiuio configure 0.7.0.14 ++iscsiuio configure 0.7.2.1 +generated by GNU Autoconf 2.59 + +Copyright (C) 2003 Free Software Foundation, Inc. @@ -11983,7 +11983,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure open-iscsi-2.0-872-r +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + -+It was created by iscsiuio $as_me 0.7.0.14, which was ++It was created by iscsiuio $as_me 0.7.2.1, which was +generated by GNU Autoconf 2.59. Invocation command line was + + $ $0 $@ @@ -32534,7 +32534,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure open-iscsi-2.0-872-r +} >&5 +cat >&5 <<_CSEOF + -+This file was extended by iscsiuio $as_me 0.7.0.14, which was ++This file was extended by iscsiuio $as_me 0.7.2.1, which was +generated by GNU Autoconf 2.59. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES @@ -32597,7 +32597,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure open-iscsi-2.0-872-r + +cat >>$CONFIG_STATUS <<_ACEOF +ac_cs_version="\\ -+iscsiuio config.status 0.7.0.14 ++iscsiuio config.status 0.7.2.1 +configured by $0, generated by GNU Autoconf 2.59, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" + @@ -33592,9 +33592,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure open-iscsi-2.0-872-r + $ac_cs_success || { (exit 1); exit 1; } +fi + -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure.ac open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/configure.ac +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure.ac open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/configure.ac --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure.ac 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/configure.ac 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/configure.ac 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,92 @@ +dnl iscsiuio uIP user space stack configure.ac file +dnl @@ -33688,9 +33688,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/configure.ac open-iscsi-2.0-87 +src/uip/Makefile +src/unix/Makefile +src/unix/libs/Makefile]) -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/COPYING open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/COPYING +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/COPYING open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/COPYING --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/COPYING 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/COPYING 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/COPYING 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 @@ -34366,9 +34366,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/COPYING open-iscsi-2.0-872-rc4 +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/depcomp open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/depcomp +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/depcomp open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/depcomp --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/depcomp 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/depcomp 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/depcomp 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,589 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects @@ -34959,9 +34959,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/depcomp open-iscsi-2.0-872-rc4 +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/docs/iscsiuio.8 open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/docs/iscsiuio.8 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/docs/iscsiuio.8 open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/docs/iscsiuio.8 --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/docs/iscsiuio.8 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/docs/iscsiuio.8 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/docs/iscsiuio.8 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,77 @@ +.\" Copyright (c) 2010-2012 Broadcom Corporation +.\" This is free documentation; you can redistribute it and/or @@ -35040,9 +35040,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/docs/iscsiuio.8 open-iscsi-2.0 +Benjamin Li \- benli@broadcom.com +.P +Eddie Wai \- eddie.wai@broadcom.com -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/config.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/config.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,76 @@ +/* + * iSCSI Configuration @@ -35120,9 +35120,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2. +} iface_rec_t; + +#endif /* CONFIG_H */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/fw_context.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/fw_context.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/fw_context.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/fw_context.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/fw_context.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/fw_context.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/fw_context.h 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,64 @@ +/* + * This program is free software; you can redistribute it and/or modify @@ -35188,9 +35188,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/fw_context.h open-iscs +extern void fw_free_targets(struct list_head *list); + +#endif /* FWPARAM_CONTEXT_H_ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_if.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/iscsi_if.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_if.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/iscsi_if.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_if.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/iscsi_if.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/iscsi_if.h 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,473 @@ +/* + * iSCSI User/Kernel Shares (Defines, Constants, Protocol definitions, etc) @@ -35665,9 +35665,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_if.h open-iscsi- +}; + +#endif -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_net_util.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/iscsi_net_util.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_net_util.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/iscsi_net_util.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_net_util.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/iscsi_net_util.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/iscsi_net_util.h 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,11 @@ +#ifndef __ISCSI_NET_UTIL_h__ +#define __ISCSI_NET_UTIL_h__ @@ -35680,9 +35680,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_net_util.h open- + char *gateway, char *remote_ip, int needs_bringup); + +#endif -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_proto.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/iscsi_proto.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_proto.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/iscsi_proto.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_proto.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/iscsi_proto.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/iscsi_proto.h 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,637 @@ +/* + * RFC 3720 (iSCSI) protocol data types @@ -36321,9 +36321,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/iscsi_proto.h open-isc +/************************* RFC 3720 End *****************************/ + +#endif /* ISCSI_PROTO_H */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/list.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/list.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/list.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/list.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/list.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/list.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/list.h 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,93 @@ +#ifndef __LIST_H__ +#define __LIST_H__ @@ -36418,9 +36418,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/list.h open-iscsi-2.0- +} + +#endif -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/mgmt_ipc.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/mgmt_ipc.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/mgmt_ipc.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/mgmt_ipc.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/mgmt_ipc.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/mgmt_ipc.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/mgmt_ipc.h 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,147 @@ +/* + * iSCSI Daemon/Admin Management IPC @@ -36569,9 +36569,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/mgmt_ipc.h open-iscsi- +void mgmt_ipc_handle(int accept_fd); + +#endif /* MGMT_IPC_H */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/sysdeps.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/sysdeps.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/sysdeps.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/sysdeps.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/sysdeps.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/sysdeps.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/sysdeps.h 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,27 @@ +/* + * wrapping of libc features and kernel interfaces @@ -36600,9 +36600,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/sysdeps.h open-iscsi-2 +extern size_t strlcat(char *dst, const char *src, size_t size); + +#endif -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/uip_mgmt_ipc.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/uip_mgmt_ipc.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/uip_mgmt_ipc.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/uip_mgmt_ipc.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/uip_mgmt_ipc.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/include/uip_mgmt_ipc.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/uip_mgmt_ipc.h 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,66 @@ +/* + * uIP iSCSI Daemon/Admin Management IPC @@ -36670,9 +36670,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/uip_mgmt_ipc.h open-is +} iscsid_uip_rsp_t; + +#endif /* UIP_MGMT_IPC_H */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/INSTALL open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/INSTALL +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/INSTALL open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/INSTALL --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/INSTALL 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/INSTALL 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/INSTALL 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,291 @@ +Installation Instructions +************************* @@ -36965,9 +36965,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/INSTALL open-iscsi-2.0-872-rc4 +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/install-sh open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/install-sh +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/install-sh open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/install-sh --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/install-sh 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/install-sh 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/install-sh 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,519 @@ +#!/bin/sh +# install - install a program, script, or datafile @@ -37488,9 +37488,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/install-sh open-iscsi-2.0-872- +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/iscsiuiolog open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/iscsiuiolog +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/iscsiuiolog open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/iscsiuiolog --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/iscsiuiolog 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/iscsiuiolog 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/iscsiuiolog 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,11 @@ +/var/log/iscsiuio.log { + weekly @@ -37503,9 +37503,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/iscsiuiolog open-iscsi-2.0-872 + endscript +} + -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/ltmain.sh open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/ltmain.sh +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/ltmain.sh open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/ltmain.sh --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/ltmain.sh 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/ltmain.sh 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/ltmain.sh 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,6911 @@ +# ltmain.sh - Provide generalized library-building support services. +# NOTE: Changing this file will not affect anything until you rerun configure. @@ -44418,9 +44418,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/ltmain.sh open-iscsi-2.0-872-r +# mode:shell-script +# sh-indentation:2 +# End: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/Makefile.am +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/Makefile.am --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/Makefile.am 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/Makefile.am 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/Makefile.am 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,25 @@ +SUBDIRS= src + @@ -44447,9 +44447,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/Makefile.am open-iscsi-2.0-872 +install-brcm: + -rm -f $(sbindir)/brcm_iscsiuio + -ln -s $(sbindir)/iscsiuio $(sbindir)/brcm_iscsiuio -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/Makefile.in +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/Makefile.in --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/Makefile.in 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/Makefile.in 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/Makefile.in 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,629 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ @@ -45080,9 +45080,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/Makefile.in open-iscsi-2.0-872 +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/missing open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/missing +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/missing open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/missing --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/missing 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/missing 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/missing 2012-04-09 21:52:14.000000000 -0500 @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. @@ -45451,9 +45451,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/missing open-iscsi-2.0-872-rc4 +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/README open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/README +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/README open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/README --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/README 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/README 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/README 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,224 @@ +Iscsiuio Userspace Tool +Version 0.7.2.1 @@ -45679,9 +45679,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/README open-iscsi-2.0-872-rc4- + +Note: If the bnx2i and cnic drivers are unloaded, then iscsiuio will also +need to be restarted so that it can determine the iscsid version. -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/RELEASE.TXT open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/RELEASE.TXT +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/RELEASE.TXT open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/RELEASE.TXT --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/RELEASE.TXT 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/RELEASE.TXT 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/RELEASE.TXT 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,1545 @@ + Release Notes + Broadcom uIP Linux Driver @@ -47228,9 +47228,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/RELEASE.TXT open-iscsi-2.0-872 + + Impact: Linux + -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -47320,9 +47320,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi +void brcm_iscsi_appcall(struct uip_stack *ustack) +{ +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -47414,9 +47414,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/brcm_iscsi +#endif /* __BRCM_ISCSI_H__ */ +/** @} */ +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/brcm-iscsi/Makefile.am +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/brcm-iscsi/Makefile.am --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/Makefile.am 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/brcm-iscsi/Makefile.am 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/brcm-iscsi/Makefile.am 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,12 @@ +INCLUDES = -I${top_srcdir}/src/unix \ + -I${top_srcdir}/src/uip \ @@ -47430,14 +47430,14 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/Makefile.a + +lib_apps_brcm_iscsi_a_CFLAGS = $(AM_CFLAGS) \ + -DBYTE_ORDER=@ENDIAN@ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/Makefile.brcm-iscsi open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/brcm-iscsi/Makefile.brcm-iscsi +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/Makefile.brcm-iscsi open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/brcm-iscsi/Makefile.brcm-iscsi --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/Makefile.brcm-iscsi 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/brcm-iscsi/Makefile.brcm-iscsi 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/brcm-iscsi/Makefile.brcm-iscsi 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1 @@ +APP_SOURCES += brcm-iscsi.c -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/brcm-iscsi/Makefile.in +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/brcm-iscsi/Makefile.in --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/Makefile.in 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/brcm-iscsi/Makefile.in 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/brcm-iscsi/Makefile.in 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,445 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ @@ -47884,9 +47884,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/brcm-iscsi/Makefile.i +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpc.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/dhcpc.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpc.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/dhcpc.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpc.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/dhcpc.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/dhcpc.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,423 @@ +/* + * Copyright (c) 2005, Swedish Institute of Computer Science @@ -48311,9 +48311,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpc.c open-is +} + +/*---------------------------------------------------------------------------*/ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpc.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/dhcpc.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpc.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/dhcpc.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpc.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/dhcpc.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/dhcpc.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2005, Swedish Institute of Computer Science @@ -48403,9 +48403,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpc.h open-is +#define UIP_UDP_APPCALL dhcpc_appcall + +#endif /* __DHCPC_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpv6.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/dhcpv6.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpv6.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/dhcpv6.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpv6.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/dhcpv6.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/dhcpv6.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,515 @@ +/* + * Copyright (c) 2011, Broadcom Corporation @@ -48922,9 +48922,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpv6.c open-i + } + } +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpv6.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/dhcpv6.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpv6.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/dhcpv6.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpv6.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/dhcpv6.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/dhcpv6.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,263 @@ +/* + * Copyright (c) 2011, Broadcom Corporation @@ -49189,9 +49189,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/dhcpv6.h open-i +void dhcpv6_init(pDHCPV6_CONTEXT dhcpv6_context); + +#endif /* __IDHCPV6_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/Makefile.am +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/Makefile.am --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/Makefile.am 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/Makefile.am 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/Makefile.am 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,14 @@ +INCLUDES = -I${top_srcdir}/src/unix \ + -I${top_srcdir}/src/uip \ @@ -49207,14 +49207,14 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/Makefile.am ope + -DBYTE_ORDER=@ENDIAN@ + + -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/Makefile.dhcpc open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/Makefile.dhcpc +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/Makefile.dhcpc open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/Makefile.dhcpc --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/Makefile.dhcpc 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/Makefile.dhcpc 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/Makefile.dhcpc 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1 @@ +APP_SOURCES += dhcpc.c timer.c -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/Makefile.in +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/Makefile.in --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/Makefile.in 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/dhcpc/Makefile.in 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/dhcpc/Makefile.in 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,460 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ @@ -49676,14 +49676,14 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/dhcpc/Makefile.in ope +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/Makefile.am +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/Makefile.am --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/Makefile.am 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/Makefile.am 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/Makefile.am 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1 @@ +SUBDIRS = dhcpc brcm-iscsi -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/Makefile.in +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/Makefile.in --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/Makefile.in 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/Makefile.in 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/Makefile.in 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,471 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ @@ -50156,20 +50156,20 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/Makefile.in open-iscs +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/README open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/README +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/README open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/README --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/apps/README 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/apps/README 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/apps/README 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,2 @@ +This directory contains a few example applications. They are not all +heavily tested, however. -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/Makefile.am +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/Makefile.am --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/Makefile.am 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/Makefile.am 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/Makefile.am 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1 @@ +SUBDIRS = apps uip unix -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/Makefile.in +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/Makefile.in --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/Makefile.in 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/Makefile.in 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/Makefile.in 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,471 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ @@ -50642,9 +50642,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/Makefile.in open-iscsi-2.0 +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/README open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/README +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/README open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/README --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/README 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/README 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/README 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,13 @@ +uIP is a very small implementation of the TCP/IP stack that is written +by Adam Dunkels . More information can be obtained @@ -50659,9 +50659,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/README open-iscsi-2.0-872- +lib/ - Library code used by some applications +uip/ - uIP TCP/IP stack code +unix/ - uIP as a user space process under FreeBSD or Linux -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/clock.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/clock.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/clock.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/clock.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/clock.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/clock.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/clock.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,88 @@ +/** + * \defgroup clock Clock interface @@ -50751,9 +50751,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/clock.h open-iscsi-2.0 +#endif /* __CLOCK_H__ */ + +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/debug.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/debug.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/debug.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/debug.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/debug.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/debug.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/debug.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,9 @@ +#ifndef __DEBUG_H__ +#define __DEBUG_H__ @@ -50764,9 +50764,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/debug.h open-iscsi-2.0 +#endif + +#endif -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/icmpv6.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/icmpv6.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/icmpv6.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/icmpv6.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/icmpv6.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/icmpv6.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/icmpv6.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,312 @@ +/* + * Copyright (c) 2011, Broadcom Corporation @@ -51080,9 +51080,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/icmpv6.h open-iscsi-2. +#endif + +#endif /* __ICMPV6_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/ipv6.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/ipv6.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/ipv6.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/ipv6.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,1269 @@ +/* + * Copyright (c) 2011, Broadcom Corporation @@ -52353,9 +52353,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6.c open-iscsi-2.0- +{ + ipv6_context->flags |= IPV6_FLAGS_DISABLE_DHCPV6; +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/ipv6.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/ipv6.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/ipv6.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/ipv6.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,366 @@ +/* + * Copyright (c) 2011, Broadcom Corporation @@ -52723,9 +52723,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6.h open-iscsi-2.0- + pIPV6_ADDR ip_addr); + +#endif /* __IPV6_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_ndpc.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/ipv6_ndpc.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_ndpc.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/ipv6_ndpc.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_ndpc.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/ipv6_ndpc.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/ipv6_ndpc.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,408 @@ +/* + * Copyright (c) 2011, Broadcom Corporation @@ -53135,9 +53135,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_ndpc.c open-iscsi +} + +/*---------------------------------------------------------------------------*/ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_ndpc.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/ipv6_ndpc.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_ndpc.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/ipv6_ndpc.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_ndpc.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/ipv6_ndpc.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/ipv6_ndpc.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2011, Broadcom Corporation @@ -53236,9 +53236,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_ndpc.h open-iscsi +#define UIP_NDP_CALL ndpc_call + +#endif /* __NDPC_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_pkt.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/ipv6_pkt.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_pkt.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/ipv6_pkt.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_pkt.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/ipv6_pkt.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/ipv6_pkt.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2011, Broadcom Corporation @@ -53289,9 +53289,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/ipv6_pkt.h open-iscsi- +void ipv6_send_udp_packet(pIPV6_CONTEXT ipv6_context, u16_t packet_len); + +#endif /* __IPV6_PKT_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc-addrlabels.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/lc-addrlabels.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc-addrlabels.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/lc-addrlabels.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc-addrlabels.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/lc-addrlabels.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/lc-addrlabels.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2004-2005, Swedish Institute of Computer Science. @@ -53375,9 +53375,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc-addrlabels.h open-i +#endif /* __LC_ADDRLABELS_H__ */ + +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/lc.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/lc.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/lc.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/lc.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2004-2005, Swedish Institute of Computer Science. @@ -53510,9 +53510,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc.h open-iscsi-2.0-87 + +/** @} */ +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc-switch.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/lc-switch.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc-switch.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/lc-switch.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc-switch.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/lc-switch.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/lc-switch.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2004-2005, Swedish Institute of Computer Science. @@ -53590,9 +53590,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/lc-switch.h open-iscsi +#endif /* __LC_SWITCH_H__ */ + +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/Makefile.am +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/Makefile.am --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.am 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/Makefile.am 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/Makefile.am 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,17 @@ +INCLUDES = -I${top_srcdir}/src/unix \ + -I${top_srcdir}/src/apps/dhcpc \ @@ -53611,9 +53611,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.am open-iscsi + ipv6.c + +lib_iscsi_uip_a_CFLAGS = -DBYTE_ORDER=@ENDIAN@ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/Makefile.in +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/Makefile.in --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.in 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/Makefile.in 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/Makefile.in 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,561 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ @@ -54176,9 +54176,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.in open-iscsi +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.include open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/Makefile.include +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.include open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/Makefile.include --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.include 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/Makefile.include 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/Makefile.include 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,47 @@ + + @@ -54227,9 +54227,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/Makefile.include open- + +libapps.a: ${addprefix $(OBJECTDIR)/, $(APP_SOURCES:.c=.o)} + $(AR) rc $@ $^ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/psock.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/psock.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/psock.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/psock.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/psock.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/psock.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/psock.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,345 @@ +/* + * Copyright (c) 2004, Swedish Institute of Computer Science. @@ -54576,9 +54576,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/psock.c open-iscsi-2.0 +} + +/*---------------------------------------------------------------------------*/ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/psock.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/psock.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/psock.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/psock.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/psock.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/psock.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/psock.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,384 @@ +/* + * Copyright (c) 2004, Swedish Institute of Computer Science. @@ -54964,9 +54964,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/psock.h open-iscsi-2.0 +#endif /* __PSOCK_H__ */ + +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/pt.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/pt.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/pt.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/pt.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/pt.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/pt.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/pt.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,323 @@ +/* + * Copyright (c) 2004-2005, Swedish Institute of Computer Science. @@ -55291,9 +55291,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/pt.h open-iscsi-2.0-87 +#endif /* __PT_H__ */ + +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/timer.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/timer.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/timer.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/timer.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/timer.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/timer.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/timer.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,128 @@ +/** + * \addtogroup timer @@ -55423,9 +55423,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/timer.c open-iscsi-2.0 +/*---------------------------------------------------------------------------*/ + +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/timer.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/timer.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/timer.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/timer.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/timer.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/timer.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/timer.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,85 @@ +/** + * \defgroup timer Timer library @@ -55512,9 +55512,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/timer.h open-iscsi-2.0 +#endif /* __TIMER_H__ */ + +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arch.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip_arch.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arch.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip_arch.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arch.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip_arch.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip_arch.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,138 @@ +/** + * \addtogroup uip @@ -55654,9 +55654,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arch.h open-iscsi- +/** @} */ + +#endif /* __UIP_ARCH_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arp.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip_arp.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arp.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip_arp.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arp.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip_arp.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip_arp.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,485 @@ +#include +//#include @@ -56143,9 +56143,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arp.c open-iscsi-2 + +/** @} */ +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arp.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip_arp.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arp.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip_arp.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arp.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip_arp.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip_arp.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,196 @@ +/** + * \addtogroup uip @@ -56343,9 +56343,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_arp.h open-iscsi-2 +/** @} */ + +#endif /* __UIP_ARP_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,2450 @@ +#include +#include @@ -58797,9 +58797,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip.c open-iscsi-2.0-8 +} + +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_eth.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip_eth.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_eth.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip_eth.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_eth.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip_eth.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip_eth.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -58851,9 +58851,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_eth.c open-iscsi-2 + + return 0; +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_eth.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip_eth.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_eth.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip_eth.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_eth.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip_eth.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip_eth.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,43 @@ +#ifndef __UIP_ETH_H__ +#define __UIP_ETH_H__ @@ -58898,9 +58898,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip_eth.h open-iscsi-2 +int is_vlan_packet(struct uip_vlan_eth_hdr *hdr); + +#endif /* __UIP_ETH_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,1611 @@ + +/** @@ -60513,9 +60513,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip.h open-iscsi-2.0-8 +#endif /* __UIP_H__ */ + +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip-neighbor.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip-neighbor.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip-neighbor.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip-neighbor.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip-neighbor.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip-neighbor.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip-neighbor.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,221 @@ +/* + * Copyright (c) 2006, Swedish Institute of Computer Science. @@ -60738,9 +60738,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip-neighbor.c open-is +} + +/*---------------------------------------------------------------------------*/ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip-neighbor.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip-neighbor.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip-neighbor.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip-neighbor.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip-neighbor.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uip-neighbor.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uip-neighbor.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2006, Swedish Institute of Computer Science. @@ -60848,9 +60848,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uip-neighbor.h open-is +void uip_neighbor_out(struct uip_stack *ustack); + +#endif /* __UIP-NEIGHBOR_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uipopt.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uipopt.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uipopt.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uipopt.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uipopt.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip/uipopt.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip/uipopt.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,537 @@ +/** + * \defgroup uipopt Configuration options for uIP @@ -61389,9 +61389,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip/uipopt.h open-iscsi-2. +/** @} */ + +#endif /* __UIPOPT_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip-1.0-changelog.txt open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip-1.0-changelog.txt +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip-1.0-changelog.txt open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip-1.0-changelog.txt --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip-1.0-changelog.txt 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/uip-1.0-changelog.txt 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/uip-1.0-changelog.txt 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,98 @@ +* A new API: protosockets that are similar to BSD sockets but does not + require any underlying multithreading system. @@ -61491,19 +61491,19 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/uip-1.0-changelog.txt open + o UDP: network byte order on lastport in uip_udp_new(). + + o IP: memset() bugs in IP fragment reassembly code fixed. -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/build_date.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/build_date.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/build_date.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/build_date.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/build_date.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/build_date.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/build_date.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1 @@ +char *build_date ="Thu May 5 12:17:42 PDT 2011"; -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/build_date.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/build_date.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/build_date.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/build_date.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/build_date.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/build_date.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/build_date.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1 @@ +char *build_date; -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/clock-arch.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/clock-arch.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/clock-arch.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/clock-arch.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/clock-arch.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/clock-arch.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/clock-arch.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2006, Swedish Institute of Computer Science. @@ -61560,9 +61560,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/clock-arch.c open-isc +} + +/*---------------------------------------------------------------------------*/ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/clock-arch.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/clock-arch.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/clock-arch.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/clock-arch.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/clock-arch.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/clock-arch.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/clock-arch.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2006, Swedish Institute of Computer Science. @@ -61604,9 +61604,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/clock-arch.h open-isc +#define CLOCK_CONF_SECOND 1000 + +#endif /* __CLOCK_ARCH_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/iscsid_ipc.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/iscsid_ipc.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/iscsid_ipc.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/iscsid_ipc.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/iscsid_ipc.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/iscsid_ipc.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/iscsid_ipc.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,868 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -62476,9 +62476,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/iscsid_ipc.c open-isc + + LOG_INFO(PFX "iscsid listening thread has shutdown"); +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/iscsid_ipc.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/iscsid_ipc.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/iscsid_ipc.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/iscsid_ipc.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/iscsid_ipc.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/iscsid_ipc.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/iscsid_ipc.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -62531,9 +62531,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/iscsid_ipc.h open-isc +void iscsid_cleanup(); + +#endif /* __ISCSID_IPC_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/bnx2.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/bnx2.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/bnx2.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/bnx2.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,1148 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -63683,9 +63683,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2.c open-iscs + .get_uio_name = bnx2_get_uio_name, + }, +}; -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/bnx2.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/bnx2.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/bnx2.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/bnx2.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,303 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -63990,9 +63990,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2.h open-iscs + ******************************************************************************/ +struct nic_ops *bnx2_get_ops(); +#endif /* __BNX2_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2x.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/bnx2x.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2x.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/bnx2x.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2x.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/bnx2x.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/bnx2x.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,1554 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -65548,9 +65548,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2x.c open-isc + .get_uio_name = bnx2x_get_uio_name, + }, +}; -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2x.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/bnx2x.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2x.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/bnx2x.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2x.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/bnx2x.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/bnx2x.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,646 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -66198,9 +66198,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/bnx2x.h open-isc + +struct nic_ops *bnx2x_get_ops(); +#endif /* __BNX2X_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/cnic.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/cnic.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/cnic.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/cnic.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/cnic.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/cnic.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/cnic.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,788 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -66990,9 +66990,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/cnic.c open-iscs + return -EIO; + } +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/cnic.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/cnic.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/cnic.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/cnic.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/cnic.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/cnic.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/cnic.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -67047,9 +67047,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/cnic.h open-iscs + struct iscsi_path *path); + +#endif /* __CNIC_NL_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/Makefile.am +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/Makefile.am --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/Makefile.am 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/Makefile.am 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/Makefile.am 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,12 @@ +INCLUDES = -I${top_srcdir}/src/uip \ + -I${top_srcdir}/src/unix \ @@ -67063,9 +67063,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/Makefile.am open + cnic.c \ + bnx2.c \ + bnx2x.c -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/Makefile.in +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/Makefile.in --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/Makefile.in 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/libs/Makefile.in 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/libs/Makefile.in 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,449 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ @@ -67516,9 +67516,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/libs/Makefile.in open +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/logger.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/logger.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/logger.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/logger.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/logger.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/logger.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/logger.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -67701,9 +67701,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/logger.c open-iscsi-2 + + pthread_mutex_unlock(&main_log.lock); +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/logger.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/logger.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/logger.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/logger.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/logger.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/logger.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/logger.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -67833,9 +67833,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/logger.h open-iscsi-2 +#define SHUTDOWN_LOGGER 0x02 + +#endif -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/main.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/main.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/main.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/main.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/main.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/main.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/main.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,402 @@ +/* + * Copyright (c) 2001, Adam Dunkels. @@ -68239,9 +68239,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/main.c open-iscsi-2.0 + cleanup(); + exit(EXIT_FAILURE); +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/Makefile.am +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/Makefile.am open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/Makefile.am --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/Makefile.am 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/Makefile.am 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/Makefile.am 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,38 @@ +SUBDIRS= libs + @@ -68281,9 +68281,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/Makefile.am open-iscs + ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a + +iscsiuio_YFLAGS = -d -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/Makefile.in +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/Makefile.in open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/Makefile.in --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/Makefile.in 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/Makefile.in 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/Makefile.in 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,766 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ @@ -69051,9 +69051,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/Makefile.in open-iscs +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,1653 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -70708,9 +70708,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic.c open-iscsi-2.0- + + pthread_exit(NULL); +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,359 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -71071,9 +71071,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic.h open-iscsi-2.0- +int nic_packet_capture(struct nic *, struct packet *pkt); + +#endif /* __NIC_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_id.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_id.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_id.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_id.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_id.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_id.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_id.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,364 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -71439,9 +71439,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_id.c open-iscsi-2 + + return 0; +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_id.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_id.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_id.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_id.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_id.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_id.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_id.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -71489,9 +71489,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_id.h open-iscsi-2 + uint32_t * bus, uint32_t * slot, uint32_t * func); + +#endif /* __NIC_ID_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_nl.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_nl.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_nl.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_nl.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_nl.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_nl.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_nl.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,627 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -72120,9 +72120,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_nl.c open-iscsi-2 +error: + return 0; +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_nl.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_nl.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_nl.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_nl.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_nl.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_nl.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_nl.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -72177,9 +72177,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_nl.h open-iscsi-2 +extern int nl_process_if_down; + +#endif /* __NIC_NL_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_utils.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_utils.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_utils.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_utils.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_utils.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_utils.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_utils.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,1657 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -73838,9 +73838,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_utils.c open-iscs + + return rc; +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_utils.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_utils.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_utils.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_utils.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_utils.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_utils.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_utils.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -73941,9 +73941,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_utils.h open-iscs +int capture_file(char **raw, uint32_t * raw_size, const char *path); + +#endif /* __NIC_UTILS_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_vlan.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_vlan.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_vlan.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_vlan.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_vlan.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_vlan.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_vlan.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,339 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -74284,9 +74284,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_vlan.c open-iscsi + + return 0; +} -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_vlan.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_vlan.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_vlan.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_vlan.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_vlan.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/nic_vlan.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/nic_vlan.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -74376,9 +74376,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/nic_vlan.h open-iscsi + +int valid_vlan(short int vlan); +#endif /* __NIC_VLAN_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/options.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/options.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/options.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/options.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/options.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/options.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/options.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -74496,9 +74496,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/options.h open-iscsi- +#define barrier() __asm__ __volatile__("": : :"memory") + +#endif -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/packet.c open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/packet.c +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/packet.c open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/packet.c --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/packet.c 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/packet.c 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/packet.c 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -74646,9 +74646,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/packet.c open-iscsi-2 + pthread_mutex_unlock(&nic->free_packet_queue_mutex); +} + -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/packet.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/packet.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/packet.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/packet.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/packet.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/packet.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/packet.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2009-2011, Broadcom Corporation @@ -74725,9 +74725,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/packet.h open-iscsi-2 +void reset_packet(packet_t * pkt); + +#endif /* __PACKET_H__ */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/uip-conf.h open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/uip-conf.h +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/uip-conf.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/uip-conf.h --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/uip-conf.h 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/src/unix/uip-conf.h 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/src/unix/uip-conf.h 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1,161 @@ +/** + * \addtogroup uipopt @@ -74890,8 +74890,8 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/src/unix/uip-conf.h open-iscsi + +/** @} */ +/** @} */ -diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/stamp-h1 open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/stamp-h1 +diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/stamp-h1 open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/stamp-h1 --- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/stamp-h1 1969-12-31 18:00:00.000000000 -0600 -+++ open-iscsi-2.0-872-rc4-bnx2i.uio/iscsiuio/stamp-h1 2012-03-05 23:26:42.000000000 -0600 ++++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/stamp-h1 2012-04-09 21:52:15.000000000 -0500 @@ -0,0 +1 @@ +timestamp for config.h diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index afe35ee..3ea7d4e 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -3,7 +3,7 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.2.0.872 -Release: 40%{?dist} +Release: 41%{?dist} Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc4-bnx2i.tar.gz Source1: iscsid.init Source2: iscsidevs.init @@ -37,7 +37,7 @@ Patch11: iscsi-initiator-utils-libiscsi-to-support-offload.patch # sync to upstream commit f9f627fbf0fc96545931ae65aa2b6214841bfd4e to # add iscsiadm ping and host chap support and fix default iface handling Patch12: iscsi-initiator-utils-ping-and-chap.patch -# sync to upstream d43143e673eec118e6645a2f46a9f202f341afd7 +# sync to upstream 6676a1cf6f2d23961e9db70155b5d0e5ce511989 Patch13: iscsi-initiator-utils-mod-iface-andport-fixes.patch # add rhel version info to iscsi tools Patch14: iscsi-initiator-utils-add-rh-ver.patch @@ -208,6 +208,10 @@ fi %{_includedir}/libiscsi.h %changelog +* Thu Apr 5 2012 Mike Christie 6.2.0.872.41 +- 810197 Coverity fixes. +- 740054 fix iscsiuio version string + * Wed Apr 4 2012 Mike Christie 6.2.0.872.40 - 738192 Fix regression added when handling 738192 where unknown params messages got logged by mistake.