aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/eth1394.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ieee1394/eth1394.c')
-rw-r--r--drivers/ieee1394/eth1394.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index b2d2c4dd075b..3ec3b13e4917 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -933,7 +933,7 @@ static inline u16 ether1394_parse_encap(struct sk_buff *skb,
933 *(u32*)arp_ptr = arp1394->sip; /* move sender IP addr */ 933 *(u32*)arp_ptr = arp1394->sip; /* move sender IP addr */
934 arp_ptr += arp->ar_pln; /* skip over sender IP addr */ 934 arp_ptr += arp->ar_pln; /* skip over sender IP addr */
935 935
936 if (arp->ar_op == 1) 936 if (arp->ar_op == htons(ARPOP_REQUEST))
937 /* just set ARP req target unique ID to 0 */ 937 /* just set ARP req target unique ID to 0 */
938 *((u64*)arp_ptr) = 0; 938 *((u64*)arp_ptr) = 0;
939 else 939 else
@@ -1393,7 +1393,7 @@ static inline void ether1394_arp_to_1394arp(struct sk_buff *skb,
1393/* We need to encapsulate the standard header with our own. We use the 1393/* We need to encapsulate the standard header with our own. We use the
1394 * ethernet header's proto for our own. */ 1394 * ethernet header's proto for our own. */
1395static inline unsigned int ether1394_encapsulate_prep(unsigned int max_payload, 1395static inline unsigned int ether1394_encapsulate_prep(unsigned int max_payload,
1396 int proto, 1396 __be16 proto,
1397 union eth1394_hdr *hdr, 1397 union eth1394_hdr *hdr,
1398 u16 dg_size, u16 dgl) 1398 u16 dg_size, u16 dgl)
1399{ 1399{
@@ -1624,7 +1624,7 @@ static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)
1624 gfp_t kmflags = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL; 1624 gfp_t kmflags = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
1625 struct eth1394hdr *eth; 1625 struct eth1394hdr *eth;
1626 struct eth1394_priv *priv = netdev_priv(dev); 1626 struct eth1394_priv *priv = netdev_priv(dev);
1627 int proto; 1627 __be16 proto;
1628 unsigned long flags; 1628 unsigned long flags;
1629 nodeid_t dest_node; 1629 nodeid_t dest_node;
1630 eth1394_tx_type tx_type; 1630 eth1394_tx_type tx_type;