The patch titled
eth1394: endian fixes
has been removed from the -mm tree. Its filename is
eth1394-endian-fixes.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: eth1394: endian fixes
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/eth1394.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/ieee1394/eth1394.c~eth1394-endian-fixes drivers/ieee1394/eth1394.c
--- devel/drivers/ieee1394/eth1394.c~eth1394-endian-fixes 2006-06-09 15:21:06.000000000 -0700
+++ devel-akpm/drivers/ieee1394/eth1394.c 2006-06-09 15:21:06.000000000 -0700
@@ -931,7 +931,7 @@ static inline u16 ether1394_parse_encap(
*(u32*)arp_ptr = arp1394->sip; /* move sender IP addr */
arp_ptr += arp->ar_pln; /* skip over sender IP addr */
- if (arp->ar_op == 1)
+ if (arp->ar_op == htons(ARPOP_REQUEST))
/* just set ARP req target unique ID to 0 */
*((u64*)arp_ptr) = 0;
else
@@ -1391,7 +1391,7 @@ static inline void ether1394_arp_to_1394
/* We need to encapsulate the standard header with our own. We use the
* ethernet header's proto for our own. */
static inline unsigned int ether1394_encapsulate_prep(unsigned int max_payload,
- int proto,
+ __be16 proto,
union eth1394_hdr *hdr,
u16 dg_size, u16 dgl)
{
@@ -1622,7 +1622,7 @@ static int ether1394_tx (struct sk_buff
gfp_t kmflags = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
struct eth1394hdr *eth;
struct eth1394_priv *priv = netdev_priv(dev);
- int proto;
+ __be16 proto;
unsigned long flags;
nodeid_t dest_node;
eth1394_tx_type tx_type;
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
git-acpi.patch
git-block.patch
git-ieee1394.patch
git-libata-all.patch
git-mtd.patch
git-netdev-all.patch
git-net.patch
git-nfs.patch
x86-dont-trigger-full-rebuild-via-config_mtrr.patch
dont-trigger-full-rebuild-via-config_x86_mce.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
two-additions-to-linux-documentation-ioctl-numbertxt.patch
more-bug_on-conversion.patch
emu10k1-mark-midi_spinlock-as-used.patch
nbd-endian-annotations.patch
documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
