diff options
author | David S. Miller | 2014-06-04 08:32:12 +0200 |
---|---|---|
committer | David S. Miller | 2014-06-04 08:32:12 +0200 |
commit | c99f7abf0e69987e4add567e155e042cb1f2a20b (patch) | |
tree | d23898dc30ed25c1dae9bb6325041027d412397a /drivers/staging/rtl8192e | |
parent | net: remove some unless free on failure in alloc_netdev_mqs() (diff) | |
parent | sh_eth: fix SH7619/771x support (diff) | |
download | kernel-qcow2-linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.gz kernel-qcow2-linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.xz kernel-qcow2-linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/net/inetpeer.h
net/ipv6/output_core.c
Changes in net were fixing bugs in code removed in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging/rtl8192e')
-rw-r--r-- | drivers/staging/rtl8192e/rtllib_tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index 11d0a9d8ee59..b7dd1539bbc4 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -171,7 +171,7 @@ inline int rtllib_put_snap(u8 *data, u16 h_proto) snap->oui[1] = oui[1]; snap->oui[2] = oui[2]; - *(u16 *)(data + SNAP_SIZE) = h_proto; + *(__be16 *)(data + SNAP_SIZE) = htons(h_proto); return SNAP_SIZE + sizeof(u16); } |