Skip to content

Able to build module for Kernel 4.5.4-1 of newer #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Falien164 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Able to build module for Kernel 4.5.4-1 of newer #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions iptables-module/compat_xtables.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ struct xt_match *xtnu_request_find_match(unsigned int af, const char *name,
return match;
}
EXPORT_SYMBOL_GPL(xtnu_request_find_match);

#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
int xtnu_ip_route_me_harder(struct sk_buff **pskb, unsigned int addr_type)
{
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
Expand All @@ -476,7 +476,7 @@ int xtnu_ip_route_me_harder(struct sk_buff **pskb, unsigned int addr_type)
#endif
}
EXPORT_SYMBOL_GPL(xtnu_ip_route_me_harder);

#endif
int xtnu_skb_make_writable(struct sk_buff **pskb, unsigned int len)
{
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 23)
Expand Down
14 changes: 9 additions & 5 deletions iptables-module/xt_mpeg2ts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ static const struct file_operations dl_file_ops;
#endif

static int debug = -1;
static int msg_level;
//static int msg_level;
static int msg_level = MPEG2TS_MSG_DEFAULT;
module_param(debug, int, 0);
module_param(msg_level, int, 0664);
MODULE_PARM_DESC(debug, "Set low N bits of message level");
Expand Down Expand Up @@ -1299,14 +1300,15 @@ static void mpeg2ts_seq_stop(struct seq_file *s, void *v)
static int mpeg2ts_seq_show_real(struct mpeg2ts_stream *stream,
struct seq_file *s, unsigned int bucket)
{
int res;
//int res;

if (!atomic_inc_not_zero(&stream->use)) {
/* If "use" is zero, then we about to be free'd */
return 0;
}

res = seq_printf(s, "bucket:%d dst:%pI4 src:%pI4 dport:%u sport:%u "
//res =
seq_printf(s, "bucket:%d dst:%pI4 src:%pI4 dport:%u sport:%u "
"pids:%d skips:%llu discontinuity:%llu "
"payload_bytes:%llu packets:%llu\n",
bucket,
Expand All @@ -1323,7 +1325,8 @@ static int mpeg2ts_seq_show_real(struct mpeg2ts_stream *stream,

atomic_dec(&stream->use);

return res;
//return res;
return seq_has_overflowed(s);
}

static int mpeg2ts_seq_show(struct seq_file *s, void *v)
Expand Down Expand Up @@ -1434,7 +1437,8 @@ static int __init mpeg2ts_mt_init(void)
*/
INIT_LIST_HEAD(&conn_htables);

msg_level = netif_msg_init(debug, MPEG2TS_MSG_DEFAULT);
//msg_level = netif_msg_init(debug, MPEG2TS_MSG_DEFAULT);
msg_level = netif_msg_init(debug, msg_level);
msg_info(DRV, "Loading: %s", version);
msg_dbg(DRV, "Message level (msg_level): 0x%X", msg_level);

Expand Down