git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (8207): uvcvideo: Fix a buffer overflow in format descriptor parsing
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ne2k-pci.c
diff --git
a/drivers/net/ne2k-pci.c
b/drivers/net/ne2k-pci.c
index
b569c90
..
de0de74
100644
(file)
--- a/
drivers/net/ne2k-pci.c
+++ b/
drivers/net/ne2k-pci.c
@@
-535,9
+535,9
@@
static void ne2k_pci_block_input(struct net_device *dev, int count,
if (count & 3) {
buf += count & ~3;
if (count & 2) {
if (count & 3) {
buf += count & ~3;
if (count & 2) {
-
u16 *b = (u
16 *)buf;
+
__le16 *b = (__le
16 *)buf;
- *b++ =
le16_to_cpu
(inw(NE_BASE + NE_DATAPORT));
+ *b++ =
cpu_to_le16
(inw(NE_BASE + NE_DATAPORT));
buf = (char *)b;
}
if (count & 1)
buf = (char *)b;
}
if (count & 1)
@@
-600,9
+600,9
@@
static void ne2k_pci_block_output(struct net_device *dev, int count,
if (count & 3) {
buf += count & ~3;
if (count & 2) {
if (count & 3) {
buf += count & ~3;
if (count & 2) {
-
u16 *b = (u
16 *)buf;
+
__le16 *b = (__le
16 *)buf;
- outw(
cpu_to_le16
(*b++), NE_BASE + NE_DATAPORT);
+ outw(
le16_to_cpu
(*b++), NE_BASE + NE_DATAPORT);
buf = (char *)b;
}
}
buf = (char *)b;
}
}