diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-01 05:45:41 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-01 05:45:41 +0200 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /drivers/isdn | |
| parent | Merge branch 'master' into upstream (diff) | |
| parent | [PATCH] SCSI: fix request flag-related build breakage (diff) | |
| download | linux-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.tar.xz linux-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/i4l/isdn_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 43da8ae1b2ad..1f8d6ae66b41 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c @@ -1614,8 +1614,8 @@ isdn_net_ciscohdlck_slarp_send_reply(isdn_net_local *lp) struct sk_buff *skb; unsigned char *p; struct in_device *in_dev = NULL; - u32 addr = 0; /* local ipv4 address */ - u32 mask = 0; /* local netmask */ + __be32 addr = 0; /* local ipv4 address */ + __be32 mask = 0; /* local netmask */ if ((in_dev = lp->netdev->dev.ip_ptr) != NULL) { /* take primary(first) address of interface */ |