Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268271
b: refs/heads/master
c: ddf488b
h: refs/heads/master
i:
  268269: 64594d9
  268267: cbe0ce8
  268263: 2d741df
  268255: cde25f9
v: v3
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent 3059b99 commit 2e0dc19
Show file tree
Hide file tree
Showing 2 changed files with 1 addition 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: 5ee574e0c4ff86f3759987f833f06d4f0cdeb953
refs/heads/master: ddf488baf638af36c49ed71171b8375582e5bd5f
4 changes: 0 additions & 4 deletions trunk/drivers/staging/et131x/et131x_adapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ struct ce_stats {
u32 interrupt_status;
};


/* The private adapter structure */
struct et131x_adapter {
struct net_device *netdev;
Expand Down Expand Up @@ -179,11 +178,8 @@ struct et131x_adapter {

/* Registry parameters */
u8 wanted_flow; /* Flow we want for 802.3x flow control */

u32 registry_rx_mem_end; /* Size of internal rx memory */
u32 registry_jumbo_packet; /* Max supported ethernet packet size */


/* Derived from the registry: */
u8 ai_force_duplex; /* duplex setting */
u16 ai_force_speed; /* 'Speed', user over-ride of line speed */
Expand Down

0 comments on commit 2e0dc19

Please sign in to comment.