git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcompat: Mark ovs-brcompat as deprecated.
[sliver-openvswitch.git]
/
datapath
/
linux
/
compat
/
genetlink.inc
diff --git
a/datapath/linux/compat/genetlink.inc
b/datapath/linux/compat/genetlink.inc
index
bf96980
..
ad2630f
100644
(file)
--- a/
datapath/linux/compat/genetlink.inc
+++ b/
datapath/linux/compat/genetlink.inc
@@
-86,33
+86,33
@@
err_out:
* nlmsg_notify - send a notification netlink message
* @sk: netlink socket to use
* @skb: notification message
* nlmsg_notify - send a notification netlink message
* @sk: netlink socket to use
* @skb: notification message
- * @p
id: destination netlink p
id for reports or 0
+ * @p
ortid: destination netlink port
id for reports or 0
* @group: destination multicast group or 0
* @report: 1 to report back, 0 to disable
* @flags: allocation flags
*/
* @group: destination multicast group or 0
* @report: 1 to report back, 0 to disable
* @flags: allocation flags
*/
-int nlmsg_notify(struct sock *sk, struct sk_buff *skb, u32 pid,
+int nlmsg_notify(struct sock *sk, struct sk_buff *skb, u32 p
ort
id,
unsigned int group, int report, gfp_t flags)
{
int err = 0;
if (group) {
unsigned int group, int report, gfp_t flags)
{
int err = 0;
if (group) {
- int exclude_pid = 0;
+ int exclude_p
ort
id = 0;
if (report) {
atomic_inc(&skb->users);
if (report) {
atomic_inc(&skb->users);
- exclude_p
id = p
id;
+ exclude_p
ortid = port
id;
}
/* errors reported via destination sk->sk_err, but propagate
* delivery errors if NETLINK_BROADCAST_ERROR flag is set */
}
/* errors reported via destination sk->sk_err, but propagate
* delivery errors if NETLINK_BROADCAST_ERROR flag is set */
- err = nlmsg_multicast(sk, skb, exclude_pid, group, flags);
+ err = nlmsg_multicast(sk, skb, exclude_p
ort
id, group, flags);
}
if (report) {
int err2;
}
if (report) {
int err2;
- err2 = nlmsg_unicast(sk, skb, pid);
+ err2 = nlmsg_unicast(sk, skb, p
ort
id);
if (!err || err == -ESRCH)
err = err2;
}
if (!err || err == -ESRCH)
err = err2;
}
@@
-124,7
+124,7
@@
int nlmsg_notify(struct sock *sk, struct sk_buff *skb, u32 pid,
/* This is analogous to rtnl_notify() but uses genl_sock instead of rtnl.
*
* This is not (yet) in any upstream kernel. */
/* This is analogous to rtnl_notify() but uses genl_sock instead of rtnl.
*
* This is not (yet) in any upstream kernel. */
-void genl_notify(struct sk_buff *skb, struct net *net, u32 pid, u32 group,
+void genl_notify(struct sk_buff *skb, struct net *net, u32 p
ort
id, u32 group,
struct nlmsghdr *nlh, gfp_t flags)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
struct nlmsghdr *nlh, gfp_t flags)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
@@
-137,12
+137,12
@@
void genl_notify(struct sk_buff *skb, struct net *net, u32 pid, u32 group,
if (nlh)
report = nlmsg_report(nlh);
if (nlh)
report = nlmsg_report(nlh);
- nlmsg_notify(sk, skb, pid, group, report, flags);
+ nlmsg_notify(sk, skb, p
ort
id, group, report, flags);
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
/* This function wasn't exported before 2.6.30. Lose! */
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
/* This function wasn't exported before 2.6.30. Lose! */
-void netlink_set_err(struct sock *ssk, u32 pid, u32 group, int code)
+void netlink_set_err(struct sock *ssk, u32 p
ort
id, u32 group, int code)
{
}
#endif
{
}
#endif