Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299998
b: refs/heads/master
c: 70f8002
h: refs/heads/master
v: v3
  • Loading branch information
Joakim Tjernlund authored and David S. Miller committed May 3, 2012
1 parent 466a061 commit 6070061
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 5bbdc057c270cc0d672ead03320ed8d7a11bac03
refs/heads/master: 70f8002d7813ffc5dd9ff3e9d01a17794fb4a4df
6 changes: 3 additions & 3 deletions trunk/drivers/net/ethernet/freescale/ucc_geth.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ static struct ucc_geth_info ugeth_primary_info = {
.maxGroupAddrInHash = 4,
.maxIndAddrInHash = 4,
.prel = 7,
.maxFrameLength = 1518,
.maxFrameLength = 1518+16, /* Add extra bytes for VLANs etc. */
.minFrameLength = 64,
.maxD1Length = 1520,
.maxD2Length = 1520,
.maxD1Length = 1520+16, /* Add extra bytes for VLANs etc. */
.maxD2Length = 1520+16, /* Add extra bytes for VLANs etc. */
.vlantype = 0x8100,
.ecamptr = ((uint32_t) NULL),
.eventRegMask = UCCE_OTHER,
Expand Down

0 comments on commit 6070061

Please sign in to comment.