Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 217151
b: refs/heads/master
c: 44180a5
h: refs/heads/master
i:
  217149: 623cc98
  217147: 74f2617
  217143: 6945320
  217135: 70085b3
  217119: da2c86d
  217087: 3db2d0f
v: v3
  • Loading branch information
Michal Simek committed Oct 21, 2010
1 parent 4d56109 commit ac38fa3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b4dcaee50a3859bc3c7e6bace5daeec1d903e239
refs/heads/master: 44180a573ec936cd989a7c0478f5fd1cf8e1ebc3
8 changes: 4 additions & 4 deletions trunk/drivers/net/xilinx_emaclite.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,18 +430,18 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data)
}

/* Get the protocol type of the ethernet frame that arrived */
proto_type = ((in_be32(addr + XEL_HEADER_OFFSET +
XEL_RXBUFF_OFFSET) >> XEL_HEADER_SHIFT) &
proto_type = ((ntohl(in_be32(addr + XEL_HEADER_OFFSET +
XEL_RXBUFF_OFFSET)) >> XEL_HEADER_SHIFT) &
XEL_RPLR_LENGTH_MASK);

/* Check if received ethernet frame is a raw ethernet frame
* or an IP packet or an ARP packet */
if (proto_type > (ETH_FRAME_LEN + ETH_FCS_LEN)) {

if (proto_type == ETH_P_IP) {
length = ((in_be32(addr +
length = ((ntohl(in_be32(addr +
XEL_HEADER_IP_LENGTH_OFFSET +
XEL_RXBUFF_OFFSET) >>
XEL_RXBUFF_OFFSET)) >>
XEL_HEADER_SHIFT) &
XEL_RPLR_LENGTH_MASK);
length += ETH_HLEN + ETH_FCS_LEN;
Expand Down

0 comments on commit ac38fa3

Please sign in to comment.