summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2013-07-13 17:46:37 +0200
committerTobias Klauser <tklauser@distanz.ch>2013-07-13 17:46:37 +0200
commita05ee98d49977ec112a64daf48cb7b83da21de0e (patch)
tree9e338f4f00df22d520eb634027cd547ff13bee21
parente4465480c2fb8b23a0786e6d395597ea3d0d9888 (diff)
pcap_io: Remove unused parameter sll from pcap_pkthdr_to_tpacket_hdr()
The sll parameter is not used anywhere in the function, so remove it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
-rw-r--r--netsniff-ng.c5
-rw-r--r--pcap_io.h3
2 files changed, 3 insertions, 5 deletions
diff --git a/netsniff-ng.c b/netsniff-ng.c
index 7b08ed0..0d9046c 100644
--- a/netsniff-ng.c
+++ b/netsniff-ng.c
@@ -279,7 +279,7 @@ static void pcap_to_xmit(struct ctx *ctx)
!bpf_run_filter(&bpf_ops, out,
pcap_get_length(&phdr, ctx->magic)));
- pcap_pkthdr_to_tpacket_hdr(&phdr, ctx->magic, &hdr->tp_h, &hdr->s_ll);
+ pcap_pkthdr_to_tpacket_hdr(&phdr, ctx->magic, &hdr->tp_h);
ctx->tx_bytes += hdr->tp_h.tp_len;;
ctx->tx_packets++;
@@ -540,7 +540,6 @@ static void read_pcap(struct ctx *ctx)
struct sock_fprog bpf_ops;
struct frame_map fm;
struct timeval start, end, diff;
- struct sockaddr_ll sll;
bug_on(!__pcap_io);
@@ -615,7 +614,7 @@ static void read_pcap(struct ctx *ctx)
!bpf_run_filter(&bpf_ops, out,
pcap_get_length(&phdr, ctx->magic)));
- pcap_pkthdr_to_tpacket_hdr(&phdr, ctx->magic, &fm.tp_h, &sll);
+ pcap_pkthdr_to_tpacket_hdr(&phdr, ctx->magic, &fm.tp_h);
ctx->tx_bytes += fm.tp_h.tp_len;
ctx->tx_packets++;
diff --git a/pcap_io.h b/pcap_io.h
index 31685b4..b53dcb2 100644
--- a/pcap_io.h
+++ b/pcap_io.h
@@ -450,8 +450,7 @@ static inline void tpacket3_hdr_to_pcap_pkthdr(struct tpacket3_hdr *thdr,
static inline void pcap_pkthdr_to_tpacket_hdr(pcap_pkthdr_t *phdr,
enum pcap_type type,
- struct tpacket2_hdr *thdr,
- struct sockaddr_ll *sll)
+ struct tpacket2_hdr *thdr)
{
switch (type) {
case DEFAULT: