diff --git a/[refs] b/[refs] index 779791aeee9a..2a7ee55102a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 166c050bda80bb5dd627a287b6efcdfb68d172b4 +refs/heads/master: e0c87bd95e8dad455c23bc56513af8dcb1737e55 diff --git a/trunk/drivers/net/rionet.c b/trunk/drivers/net/rionet.c index 3bb131137033..7145714a5ec9 100644 --- a/trunk/drivers/net/rionet.c +++ b/trunk/drivers/net/rionet.c @@ -88,8 +88,8 @@ static struct rio_dev **rionet_active; #define dev_rionet_capable(dev) \ is_rionet_capable(dev->src_ops, dev->dst_ops) -#define RIONET_MAC_MATCH(x) (*(u32 *)x == 0x00010001) -#define RIONET_GET_DESTID(x) (*(u16 *)(x + 4)) +#define RIONET_MAC_MATCH(x) (!memcmp((x), "\00\01\00\01", 4)) +#define RIONET_GET_DESTID(x) ((*((u8 *)x + 4) << 8) | *((u8 *)x + 5)) static int rionet_rx_clean(struct net_device *ndev) {