git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[sfrench/cifs-2.6.git]
/
drivers
/
infiniband
/
ulp
/
ipoib
/
ipoib.h
diff --git
a/drivers/infiniband/ulp/ipoib/ipoib.h
b/drivers/infiniband/ulp/ipoib/ipoib.h
index d8f6bb4f53fc0055328b319f620bc5a9314cc1ab..87310eeb6df07eb90c6e2e61e2f4515a85c4f22b 100644
(file)
--- a/
drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/
drivers/infiniband/ulp/ipoib/ipoib.h
@@
-310,6
+310,7
@@
extern struct workqueue_struct *ipoib_workqueue;
/* functions */
+int ipoib_poll(struct net_device *dev, int *budget);
void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr);
struct ipoib_ah *ipoib_create_ah(struct net_device *dev,