From a718275844e4406ec7a324258fa409d6680d5941 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 27 Sep 2006 18:35:47 -0700 Subject: [PATCH] --- yaml --- r: 36853 b: refs/heads/master c: bd6d610a14f2ed896b76dfb61fbdec829e44b8d3 h: refs/heads/master i: 36851: eaab83d6d47a89c627716bc571e41d6d02d1c120 v: v3 --- [refs] | 2 +- trunk/include/linux/if_arp.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 65ece5f0bc78..109306fc1d10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e11be94bf6a3bfc90816d37847e6b5b179ca2ff6 +refs/heads/master: bd6d610a14f2ed896b76dfb61fbdec829e44b8d3 diff --git a/trunk/include/linux/if_arp.h b/trunk/include/linux/if_arp.h index a8b1a2071838..7f5714214ee3 100644 --- a/trunk/include/linux/if_arp.h +++ b/trunk/include/linux/if_arp.h @@ -130,11 +130,11 @@ struct arpreq_old { struct arphdr { - unsigned short ar_hrd; /* format of hardware address */ - unsigned short ar_pro; /* format of protocol address */ + __be16 ar_hrd; /* format of hardware address */ + __be16 ar_pro; /* format of protocol address */ unsigned char ar_hln; /* length of hardware address */ unsigned char ar_pln; /* length of protocol address */ - unsigned short ar_op; /* ARP opcode (command) */ + __be16 ar_op; /* ARP opcode (command) */ #if 0 /*