← Back to branch summary

~ubuntu-branches/ubuntu/precise/tcpdump/precise-updates

« back to all changes in this revision

Viewing changes to print-sll.c

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2012-01-04 10:33:48 UTC
  • mfrom: (7.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20120104103348-6i4d0riwu9laykex
Tags: 4.2.1-1ubuntu1
https://launchpad.net/bugs/892285
* Resynchronise with Debian.  Remaining changes (LP: #892285):
  - Add enforcing AppArmor profile.
* Refreshed manpage patch to apply to new upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
print-sll.c
218
218
                caplen -= 4;
219
219
                goto recurse;
220
220
        } else {
221
 
                if (ethertype_print(ether_type, p, length, caplen) == 0) {
 
221
                if (ethertype_print(gndo, ether_type, p, length, caplen) == 0) {
222
222
                        /* ether_type not known, print raw packet */
223
223
                        if (!eflag)
224
224
                                sll_print(sllp, length + SLL_HDR_LEN);