git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
cxgb3
/
adapter.h
diff --git
a/drivers/net/cxgb3/adapter.h
b/drivers/net/cxgb3/adapter.h
index
c888e97
..
e48e508
100644
(file)
--- a/
drivers/net/cxgb3/adapter.h
+++ b/
drivers/net/cxgb3/adapter.h
@@
-195,7
+195,7
@@
struct sge_qset { /* an SGE queue set */
struct sge_rspq rspq;
struct sge_fl fl[SGE_RXQ_PER_SET];
struct sge_txq txq[SGE_TXQ_PER_SET];
-
struct napi_gro_fraginfo lro_frag_tbl
;
+
int nomem
;
int lro_enabled;
void *lro_va;
struct net_device *netdev;