aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic.h
diff options
context:
space:
mode:
authorDhananjay Phadke <dhananjay@netxen.com>2009-03-09 04:50:52 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-10 08:10:01 -0400
commit0ddc110c6fef34c554999448cdffe9c174a15fc9 (patch)
tree92edb728e2424f9b58c12e755b0035643d3da0bb /drivers/net/netxen/netxen_nic.h
parentd5df2a16133f4eb22f9a6bbc07723443568d362f (diff)
netxen: cleanup rx handling
o remove unused rx fragment handling code. o imporove check for status descriptor ownership. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic.h')
-rw-r--r--drivers/net/netxen/netxen_nic.h16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index bd5fbb4ce865..73cb1164457f 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -392,11 +392,8 @@ struct rcv_desc {
392#define STATUS_CKSUM_OK (2) 392#define STATUS_CKSUM_OK (2)
393 393
394/* owner bits of status_desc */ 394/* owner bits of status_desc */
395#define STATUS_OWNER_HOST (0x1) 395#define STATUS_OWNER_HOST (0x1ULL << 56)
396#define STATUS_OWNER_PHANTOM (0x2) 396#define STATUS_OWNER_PHANTOM (0x2ULL << 56)
397
398#define NETXEN_PROT_IP (1)
399#define NETXEN_PROT_UNKNOWN (0)
400 397
401/* Note: sizeof(status_desc) should always be a mutliple of 2 */ 398/* Note: sizeof(status_desc) should always be a mutliple of 2 */
402 399
@@ -422,15 +419,6 @@ struct rcv_desc {
422#define netxen_get_sts_opcode(sts_data) \ 419#define netxen_get_sts_opcode(sts_data) \
423 (((sts_data) >> 58) & 0x03F) 420 (((sts_data) >> 58) & 0x03F)
424 421
425#define netxen_get_sts_owner(status_desc) \
426 ((le64_to_cpu((status_desc)->status_desc_data) >> 56) & 0x03)
427#define netxen_set_sts_owner(status_desc, val) { \
428 (status_desc)->status_desc_data = \
429 ((status_desc)->status_desc_data & \
430 ~cpu_to_le64(0x3ULL << 56)) | \
431 cpu_to_le64((u64)((val) & 0x3) << 56); \
432}
433
434struct status_desc { 422struct status_desc {
435 /* Bit pattern: 0-3 port, 4-7 status, 8-11 type, 12-27 total_length 423 /* Bit pattern: 0-3 port, 4-7 status, 8-11 type, 12-27 total_length
436 28-43 reference_handle, 44-47 protocol, 48-52 pkt_offset 424 28-43 reference_handle, 44-47 protocol, 48-52 pkt_offset