diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-17 01:09:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 01:09:29 -0500 |
| commit | 2bb4646fce8d09916b351d1a62f98db7cec6fc41 (patch) | |
| tree | c1f0d002e69868606eca9d1b919835f422892063 /drivers/net/benet | |
| parent | 6836b9bdd98e3b500cd49512484df68f46e14659 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/benet')
| -rw-r--r-- | drivers/net/benet/be_cmds.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c index 3397ee327e1f..477f82bc647e 100644 --- a/drivers/net/benet/be_cmds.c +++ b/drivers/net/benet/be_cmds.c | |||
| @@ -308,6 +308,7 @@ static void be_cmd_hdr_prepare(struct be_cmd_req_hdr *req_hdr, | |||
| 308 | req_hdr->opcode = opcode; | 308 | req_hdr->opcode = opcode; |
| 309 | req_hdr->subsystem = subsystem; | 309 | req_hdr->subsystem = subsystem; |
| 310 | req_hdr->request_length = cpu_to_le32(cmd_len - sizeof(*req_hdr)); | 310 | req_hdr->request_length = cpu_to_le32(cmd_len - sizeof(*req_hdr)); |
| 311 | req_hdr->version = 0; | ||
| 311 | } | 312 | } |
| 312 | 313 | ||
| 313 | static void be_cmd_page_addrs_prepare(struct phys_addr *pages, u32 max_pages, | 314 | static void be_cmd_page_addrs_prepare(struct phys_addr *pages, u32 max_pages, |