diff for duplicates of <20050323195139.GC21418@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 4efc86e..1775eca 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,8 @@ Signed-off-by: Dean Nelson <dcn@sgi.com> Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6/arch/ia64/sn/kernel/xpnet.c 2005-03-10 08:10:56.439571861 -0600 @@ -0,0 +1,714 @@ +/* @@ -108,8 +109,8 @@ Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c +#define XPNET_MAGIC 0x88786984 /* "XNET" */ + +#define XPNET_VALID_MSG(_m) \ -+ ((XPNET_VERSION_MAJOR(_m->version) = XPNET_VERSION_MAJOR(XPNET_VERSION)) \ -+ && (msg->magic = XPNET_MAGIC)) ++ ((XPNET_VERSION_MAJOR(_m->version) == XPNET_VERSION_MAJOR(XPNET_VERSION)) \ ++ && (msg->magic == XPNET_MAGIC)) + +#define XPNET_DEVICE_NAME "xp0" + @@ -238,7 +239,7 @@ Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c + /* + * Move the data over from the the other side. + */ -+ if ((XPNET_VERSION_MINOR(msg->version) = 1) && ++ if ((XPNET_VERSION_MINOR(msg->version) == 1) && + (msg->embedded_bytes != 0)) { + dev_dbg(xpnet, "copying embedded message. memcpy(0x%p, 0x%p, " + "%lu)\n", skb->data, &msg->data, @@ -312,7 +313,7 @@ Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c + + switch(reason) { + case xpcMsgReceived: /* message received */ -+ DBUG_ON(data = NULL); ++ DBUG_ON(data == NULL); + + xpnet_receive(partid, channel, (struct xpnet_message *) data); + break; @@ -336,7 +337,7 @@ Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c + bp = xpnet_broadcast_partitions; + spin_unlock_bh(&xpnet_broadcast_lock); + -+ if (bp = 0) { ++ if (bp == 0) { + netif_carrier_off(xpnet_device); + } + @@ -439,15 +440,16 @@ Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c +xpnet_send_completed(enum xpc_retval reason, partid_t partid, int channel, + void *__qm) +{ -+ struct xpnet_pending_msg *queued_msg + (struct xpnet_pending_msg *) __qm; ++ struct xpnet_pending_msg *queued_msg = ++ (struct xpnet_pending_msg *) __qm; + + -+ DBUG_ON(queued_msg = NULL); ++ DBUG_ON(queued_msg == NULL); + + dev_dbg(xpnet, "message to %d notified with reason %d\n", + partid, reason); + -+ if (atomic_dec_return(&queued_msg->use_count) = 0) { ++ if (atomic_dec_return(&queued_msg->use_count) == 0) { + dev_dbg(xpnet, "all acks for skb->head=-x%p\n", + (void *) queued_msg->skb->head); + @@ -495,7 +497,7 @@ Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c + * remain, release the skb. + */ + queued_msg = kmalloc(sizeof(struct xpnet_pending_msg), GFP_ATOMIC); -+ if (queued_msg = NULL) { ++ if (queued_msg == NULL) { + dev_warn(xpnet, "failed to kmalloc %ld bytes; dropping " + "packet\n", sizeof(struct xpnet_pending_msg)); + @@ -529,7 +531,7 @@ Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c + + + second_mac_octet = skb->data[XPNET_PARTID_OCTET]; -+ if (second_mac_octet = 0xff) { ++ if (second_mac_octet == 0xff) { + /* we are being asked to broadcast to all partitions */ + dp = xpnet_broadcast_partitions; + } else if (second_mac_octet != 0) { @@ -604,7 +606,7 @@ Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c + + } + -+ if (atomic_dec_return(&queued_msg->use_count) = 0) { ++ if (atomic_dec_return(&queued_msg->use_count) == 0) { + dev_dbg(xpnet, "no partitions to receive packet destined for " + "%d\n", dest_partid); + @@ -652,7 +654,7 @@ Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c + */ + xpnet_device = alloc_netdev(sizeof(struct xpnet_dev_private), + XPNET_DEVICE_NAME, ether_setup); -+ if (xpnet_device = NULL) { ++ if (xpnet_device == NULL) { + return -ENOMEM; + } + @@ -676,7 +678,8 @@ Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c + xpnet_device->dev_addr[XPNET_PARTID_OCTET] = sn_partition_id; + license_num = sn_partition_serial_number_val(); + for (i = 3; i >= 0; i--) { -+ xpnet_device->dev_addr[XPNET_LICENSE_OCTET + i] + license_num & 0xff; ++ xpnet_device->dev_addr[XPNET_LICENSE_OCTET + i] = ++ license_num & 0xff; + license_num = license_num >> 8; + } + @@ -721,7 +724,8 @@ Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c +MODULE_LICENSE("GPL"); + Index: linux-2.6/arch/ia64/sn/kernel/Makefile -=================================--- linux-2.6.orig/arch/ia64/sn/kernel/Makefile 2005-03-10 08:02:31.943325829 -0600 +=================================================================== +--- linux-2.6.orig/arch/ia64/sn/kernel/Makefile 2005-03-10 08:02:31.943325829 -0600 +++ linux-2.6/arch/ia64/sn/kernel/Makefile 2005-03-10 08:07:46.580825194 -0600 @@ -14,3 +14,4 @@ xp-y := xp_main.o xp_nofault.o diff --git a/a/content_digest b/N1/content_digest index d517296..a918761 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\04241C391.mailxHNA15A8V0@aqua.americas.sgi.com\0" "From\0Dean Nelson <dcn@sgi.com>\0" "Subject\0[PATCH 3/3] SGI Altix cross partition functionality (2nd revision)\0" - "Date\0Wed, 23 Mar 2005 19:51:39 +0000\0" + "Date\0Wed, 23 Mar 2005 13:51:39 -0600\0" "To\0tony.luck@intel.com\0" "Cc\0netdev@oss.sgi.com" " linux-ia64@vger.kernel.org\0" @@ -14,7 +14,8 @@ "\n" "\n" "Index: linux-2.6/arch/ia64/sn/kernel/xpnet.c\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux-2.6/arch/ia64/sn/kernel/xpnet.c\t2005-03-10 08:10:56.439571861 -0600\n" "@@ -0,0 +1,714 @@\n" "+/*\n" @@ -117,8 +118,8 @@ "+#define XPNET_MAGIC\t0x88786984 /* \"XNET\" */\n" "+\n" "+#define XPNET_VALID_MSG(_m)\t\t\t\t\t\t \\\n" - "+ ((XPNET_VERSION_MAJOR(_m->version) = XPNET_VERSION_MAJOR(XPNET_VERSION)) \\\n" - "+ && (msg->magic = XPNET_MAGIC))\n" + "+ ((XPNET_VERSION_MAJOR(_m->version) == XPNET_VERSION_MAJOR(XPNET_VERSION)) \\\n" + "+ && (msg->magic == XPNET_MAGIC))\n" "+\n" "+#define XPNET_DEVICE_NAME\t\t\"xp0\"\n" "+\n" @@ -247,7 +248,7 @@ "+\t/*\n" "+\t * Move the data over from the the other side.\n" "+\t */\n" - "+\tif ((XPNET_VERSION_MINOR(msg->version) = 1) &&\n" + "+\tif ((XPNET_VERSION_MINOR(msg->version) == 1) &&\n" "+\t\t\t\t\t\t(msg->embedded_bytes != 0)) {\n" "+\t\tdev_dbg(xpnet, \"copying embedded message. memcpy(0x%p, 0x%p, \"\n" "+\t\t\t\"%lu)\\n\", skb->data, &msg->data,\n" @@ -321,7 +322,7 @@ "+\n" "+\tswitch(reason) {\n" "+\tcase xpcMsgReceived:\t/* message received */\n" - "+\t\tDBUG_ON(data = NULL);\n" + "+\t\tDBUG_ON(data == NULL);\n" "+\n" "+\t\txpnet_receive(partid, channel, (struct xpnet_message *) data);\n" "+\t\tbreak;\n" @@ -345,7 +346,7 @@ "+\t\tbp = xpnet_broadcast_partitions;\n" "+\t\tspin_unlock_bh(&xpnet_broadcast_lock);\n" "+\n" - "+\t\tif (bp = 0) {\n" + "+\t\tif (bp == 0) {\n" "+\t\t\tnetif_carrier_off(xpnet_device);\n" "+\t\t}\n" "+\n" @@ -448,15 +449,16 @@ "+xpnet_send_completed(enum xpc_retval reason, partid_t partid, int channel,\n" "+\t\t\tvoid *__qm)\n" "+{\n" - "+\tstruct xpnet_pending_msg *queued_msg +\t\t(struct xpnet_pending_msg *) __qm;\n" + "+\tstruct xpnet_pending_msg *queued_msg =\n" + "+\t\t(struct xpnet_pending_msg *) __qm;\n" "+\n" "+\n" - "+\tDBUG_ON(queued_msg = NULL);\n" + "+\tDBUG_ON(queued_msg == NULL);\n" "+\n" "+\tdev_dbg(xpnet, \"message to %d notified with reason %d\\n\",\n" "+\t\tpartid, reason);\n" "+\n" - "+\tif (atomic_dec_return(&queued_msg->use_count) = 0) {\n" + "+\tif (atomic_dec_return(&queued_msg->use_count) == 0) {\n" "+\t\tdev_dbg(xpnet, \"all acks for skb->head=-x%p\\n\",\n" "+\t\t\t(void *) queued_msg->skb->head);\n" "+\n" @@ -504,7 +506,7 @@ "+\t * remain, release the skb.\n" "+\t */\n" "+\tqueued_msg = kmalloc(sizeof(struct xpnet_pending_msg), GFP_ATOMIC);\n" - "+\tif (queued_msg = NULL) {\n" + "+\tif (queued_msg == NULL) {\n" "+\t\tdev_warn(xpnet, \"failed to kmalloc %ld bytes; dropping \"\n" "+\t\t\t\"packet\\n\", sizeof(struct xpnet_pending_msg));\n" "+\t\t\t\n" @@ -538,7 +540,7 @@ "+\n" "+\n" "+\tsecond_mac_octet = skb->data[XPNET_PARTID_OCTET];\n" - "+\tif (second_mac_octet = 0xff) {\n" + "+\tif (second_mac_octet == 0xff) {\n" "+\t\t/* we are being asked to broadcast to all partitions */\n" "+\t\tdp = xpnet_broadcast_partitions;\n" "+\t} else if (second_mac_octet != 0) {\n" @@ -613,7 +615,7 @@ "+\n" "+\t}\n" "+\n" - "+\tif (atomic_dec_return(&queued_msg->use_count) = 0) {\n" + "+\tif (atomic_dec_return(&queued_msg->use_count) == 0) {\n" "+\t\tdev_dbg(xpnet, \"no partitions to receive packet destined for \"\n" "+\t\t\t\"%d\\n\", dest_partid);\n" "+\n" @@ -661,7 +663,7 @@ "+\t */\n" "+\txpnet_device = alloc_netdev(sizeof(struct xpnet_dev_private),\n" "+\t\t\t\t XPNET_DEVICE_NAME, ether_setup);\n" - "+\tif (xpnet_device = NULL) {\n" + "+\tif (xpnet_device == NULL) {\n" "+\t\treturn -ENOMEM;\n" "+\t}\n" "+\n" @@ -685,7 +687,8 @@ "+\txpnet_device->dev_addr[XPNET_PARTID_OCTET] = sn_partition_id;\n" "+\tlicense_num = sn_partition_serial_number_val();\n" "+\tfor (i = 3; i >= 0; i--) {\n" - "+\t\txpnet_device->dev_addr[XPNET_LICENSE_OCTET + i] +\t\t\t\t\t\t\tlicense_num & 0xff;\n" + "+\t\txpnet_device->dev_addr[XPNET_LICENSE_OCTET + i] =\n" + "+\t\t\t\t\t\t\tlicense_num & 0xff;\n" "+\t\tlicense_num = license_num >> 8;\n" "+\t}\n" "+\n" @@ -730,7 +733,8 @@ "+MODULE_LICENSE(\"GPL\");\n" "+\n" "Index: linux-2.6/arch/ia64/sn/kernel/Makefile\n" - "=================================--- linux-2.6.orig/arch/ia64/sn/kernel/Makefile\t2005-03-10 08:02:31.943325829 -0600\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/ia64/sn/kernel/Makefile\t2005-03-10 08:02:31.943325829 -0600\n" "+++ linux-2.6/arch/ia64/sn/kernel/Makefile\t2005-03-10 08:07:46.580825194 -0600\n" "@@ -14,3 +14,4 @@\n" " xp-y\t\t\t\t:= xp_main.o xp_nofault.o\n" @@ -738,4 +742,4 @@ " xpc-y\t\t\t\t:= xpc_main.o xpc_channel.o xpc_partition.o\n" "+obj-$(CONFIG_IA64_SGI_SN_XP)\t+= xpnet.o" -9edc95c89a4b740548afe05943660a213e1c5a6acb1c64418b0e0e11920a5260 +036a7725fd535ea6a965368822b428c7dd3ef13c403e0f346d2dc332fb67dadc
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.