Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
This commit is contained in:
@@ -2164,7 +2164,8 @@ struct tcp_ulp_ops {
|
||||
/* initialize ulp */
|
||||
int (*init)(struct sock *sk);
|
||||
/* update ulp */
|
||||
void (*update)(struct sock *sk, struct proto *p);
|
||||
void (*update)(struct sock *sk, struct proto *p,
|
||||
void (*write_space)(struct sock *sk));
|
||||
/* cleanup ulp */
|
||||
void (*release)(struct sock *sk);
|
||||
/* diagnostic */
|
||||
@@ -2182,7 +2183,8 @@ void tcp_unregister_ulp(struct tcp_ulp_ops *type);
|
||||
int tcp_set_ulp(struct sock *sk, const char *name);
|
||||
void tcp_get_available_ulp(char *buf, size_t len);
|
||||
void tcp_cleanup_ulp(struct sock *sk);
|
||||
void tcp_update_ulp(struct sock *sk, struct proto *p);
|
||||
void tcp_update_ulp(struct sock *sk, struct proto *p,
|
||||
void (*write_space)(struct sock *sk));
|
||||
|
||||
#define MODULE_ALIAS_TCP_ULP(name) \
|
||||
__MODULE_INFO(alias, alias_userspace, name); \
|
||||
|
||||
Reference in New Issue
Block a user