Deleted Added
full compact
ipoib.h (257176) ipoib.h (278886)
1/*
2 * Copyright (c) 2004, 2005 Topspin Communications. All rights reserved.
3 * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
4 * Copyright (c) 2004 Voltaire, Inc. All rights reserved.
5 *
6 * This software is available to you under a choice of one of two
7 * licenses. You may choose to be licensed under the terms of the GNU
8 * General Public License (GPL) Version 2, available from the file

--- 66 unchanged lines hidden (view full) ---

75
76#include <security/mac/mac_framework.h>
77
78#include <linux/list.h>
79
80#include <linux/workqueue.h>
81#include <linux/kref.h>
82#include <linux/mutex.h>
1/*
2 * Copyright (c) 2004, 2005 Topspin Communications. All rights reserved.
3 * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
4 * Copyright (c) 2004 Voltaire, Inc. All rights reserved.
5 *
6 * This software is available to you under a choice of one of two
7 * licenses. You may choose to be licensed under the terms of the GNU
8 * General Public License (GPL) Version 2, available from the file

--- 66 unchanged lines hidden (view full) ---

75
76#include <security/mac/mac_framework.h>
77
78#include <linux/list.h>
79
80#include <linux/workqueue.h>
81#include <linux/kref.h>
82#include <linux/mutex.h>
83#include <linux/rbtree.h>
83
84#include <asm/atomic.h>
85
86#include <rdma/ib_verbs.h>
87#include <rdma/ib_pack.h>
88#include <rdma/ib_sa.h>
89
90/* constants */

--- 217 unchanged lines hidden (view full) ---

308
309/*
310 * Device private locking: network stack tx_lock protects members used
311 * in TX fast path, lock protects everything else. lock nests inside
312 * of tx_lock (ie tx_lock must be acquired first if needed).
313 */
314struct ipoib_dev_priv {
315 spinlock_t lock;
84
85#include <asm/atomic.h>
86
87#include <rdma/ib_verbs.h>
88#include <rdma/ib_pack.h>
89#include <rdma/ib_sa.h>
90
91/* constants */

--- 217 unchanged lines hidden (view full) ---

309
310/*
311 * Device private locking: network stack tx_lock protects members used
312 * in TX fast path, lock protects everything else. lock nests inside
313 * of tx_lock (ie tx_lock must be acquired first if needed).
314 */
315struct ipoib_dev_priv {
316 spinlock_t lock;
317 spinlock_t drain_lock;
316
317 struct ifnet *dev;
318
319 u8 broadcastaddr[INFINIBAND_ALEN];
320
321 unsigned long flags;
322
323 struct mutex vlan_mutex;

--- 434 unchanged lines hidden ---
318
319 struct ifnet *dev;
320
321 u8 broadcastaddr[INFINIBAND_ALEN];
322
323 unsigned long flags;
324
325 struct mutex vlan_mutex;

--- 434 unchanged lines hidden ---